diff --git a/Netdisco/Changes b/Netdisco/Changes
index 577b0311..e4208ec8 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,9 +1,16 @@
-2.017001 -
+2.017001_001 - 
+
+  [NEW FEATURES]
+
+  * Add VLAN Inventory Report
+  * Add Wireless SSID Inventory Report
+  * Add Device Inventory by Location Report
 
   [ENHANCEMENTS]
 
   * Respect ignore_interfaces and i_ignore when detecting wrapped device uptime
   * Try NodeIp OUI company name search if no node results found
+  * Format About page numbers
 
   [BUG FIXES]
 
@@ -12,6 +19,8 @@
   * Avoid macsuck generated SQL bug when cleaning NULL VLAN (W. Gould)
   * During macsuck get VLAN from Q-BRIDGE if available (jeneric)
   * OK to include device ports when doing arpnip (jeneric)
+  * Correct bulkwalk_off logic
+  * Silence warnings when ports don't support i_lastchange
 
 2.017000 - 2013-09-23
 
diff --git a/Netdisco/MANIFEST b/Netdisco/MANIFEST
index 89ab3308..0a407855 100644
--- a/Netdisco/MANIFEST
+++ b/Netdisco/MANIFEST
@@ -146,9 +146,12 @@ lib/App/Netdisco/Web/Plugin/Device/Ports.pm
 lib/App/Netdisco/Web/Plugin/Inventory.pm
 lib/App/Netdisco/Web/Plugin/Report/ApChannelDist.pm
 lib/App/Netdisco/Web/Plugin/Report/ApRadioChannelPower.pm
+lib/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm
 lib/App/Netdisco/Web/Plugin/Report/DuplexMismatch.pm
 lib/App/Netdisco/Web/Plugin/Report/HalfDuplex.pm
 lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm
+lib/App/Netdisco/Web/Plugin/Report/SsidInventory.pm
+lib/App/Netdisco/Web/Plugin/Report/VlanInventory.pm
 lib/App/Netdisco/Web/Plugin/Search/Device.pm
 lib/App/Netdisco/Web/Plugin/Search/Node.pm
 lib/App/Netdisco/Web/Plugin/Search/Port.pm
@@ -235,12 +238,18 @@ share/views/ajax/report/apchanneldist.tt
 share/views/ajax/report/apchanneldist_csv.tt
 share/views/ajax/report/apradiochannelpower.tt
 share/views/ajax/report/apradiochannelpower_csv.tt
+share/views/ajax/report/devicebylocation.tt
+share/views/ajax/report/devicebylocation_csv.tt
 share/views/ajax/report/duplexmismatch.tt
 share/views/ajax/report/duplexmismatch_csv.tt
 share/views/ajax/report/halfduplex.tt
 share/views/ajax/report/halfduplex_csv.tt
 share/views/ajax/report/portutilization.tt
 share/views/ajax/report/portutilization_csv.tt
+share/views/ajax/report/ssidinventory.tt
+share/views/ajax/report/ssidinventory_csv.tt
+share/views/ajax/report/vlaninventory.tt
+share/views/ajax/report/vlaninventory_csv.tt
 share/views/ajax/search/device.tt
 share/views/ajax/search/device_csv.tt
 share/views/ajax/search/node_by_ip.tt
diff --git a/Netdisco/META.yml b/Netdisco/META.yml
index 60d8aaa8..7439e605 100644
--- a/Netdisco/META.yml
+++ b/Netdisco/META.yml
@@ -52,6 +52,7 @@ requires:
   Starman: 0.4008
   Template: 2.24
   Template::Plugin::CSV: 0.04
+  Template::Plugin::Number::Format: 1.02
   URL::Encode: 0.01
   YAML: 0.84
   YAML::XS: 0.41
@@ -64,4 +65,4 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/bsd-license.php
   repository: git://git.code.sf.net/p/netdisco/netdisco-ng
-version: 2.017000
+version: 2.017001_001
diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm
index 0671940f..6a51a2c7 100644
--- a/Netdisco/lib/App/Netdisco.pm
+++ b/Netdisco/lib/App/Netdisco.pm
@@ -7,7 +7,7 @@ use 5.010_000;
 use File::ShareDir 'dist_dir';
 use Path::Class;
 
-our $VERSION = '2.017000';
+our $VERSION = '2.017001_001';
 
 BEGIN {
   if (not ($ENV{DANCER_APPDIR} || '')
diff --git a/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod b/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod
index d9a08d0d..641723e4 100644
--- a/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod
+++ b/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod
@@ -35,6 +35,16 @@ but they are backwards compatible.
 
 =back
 
+=head1 2.017001_001
+
+=head2 General Notices
+
+The previous mentioned bug in Macsuck is now fixed.
+
+During Arpnip, Node IPs are no longer resolved to DNS hostnames in real-time.
+In the next release, another job will be queued to perform this action for the
+device.
+
 =head1 2.017000
 
 =head2 General Notices