diff --git a/Changes b/Changes
index 26f0100d..708c7b09 100644
--- a/Changes
+++ b/Changes
@@ -1,26 +1,29 @@
-2.040003 - xxx
+2.040003 - 2019-01-18
 
   [NEW FEATURES]
   
-  * #482 operating system is now a link in device details (inphobia)
+  * #485 new "VLANs" device tab showing a VLAN report (inphobia)
 
   [ENHANCEMENTS]
 
-  * #408, #417 & 477 makerancidconf improvements: readded with some additional tweaks, somehow
-    they got lost in 2.039029. (earendilfr, inphobia)
-  * #436 make neighbor matching less strict, no longer is it required to match all parameters
-    (port name, device name) exactly before creating a link between devices. (linwood-f)
+  * #408, #417 & 477 makerancidconf improvements re-added (earendilfr, inphobia)
+  * #420 IP Inventory Node column renamed to IP Address (ollyg)
+  * #420 sidebar defaults for IP Inventory report can be overridden (ollyg)
+  * #424 column name is "Connected Nodes & Devices" when both are shown (ollyg)
+  * #436 make neighbor matching less strict in netmap (linwood-f)
+  * #482 operating system is now a link in device details (inphobia)
+  * #486 allow snmp::info base class in netdisco-do (inphobia)
 
   [BUG FIXES]
 
-  * #475 all discover plugins should now respect ignore_interfaces, ignore_notpresent_types &
-    ignore_private_nets. as a bonus discovery data is now cached for less db load. (ollyg)
-  * #476 also log when plugins delete related tables. (ollyg)
-  * #471-redux ospf discovery will now keep on working instead of stopping after a few
-    runs. (ollyg)
-  * #474 better explain public key auth with netdisco-sshcollector. (inphobia)
-  * #457 make sorting work on interface in device/adresses when interface was undefined. also
-    went through all other portsort callers to make sure parameters are always defined. (inphobia)
+  * #457 make sorting work for adresses when interface was undefined (inphobia)
+  * #471-redux ospf discovery will now keep on working (ollyg)
+  * #474 better explain public key auth with netdisco-sshcollector (inphobia)
+  * #475, #479 all discover plugins should now respect ignore_* for interfaces (ollyg)
+  * #476 debug log when deleting rows from related tables (ollyg)
+  * Fix to catch when txrate on wifi is scalar and not a list
+  * Remove 'use vars' which is deprecated in Perl
+  * Various documentation improvements (inphobia)
 
 2.040002 - 2018-12-30
 
diff --git a/META.json b/META.json
index e58fa24c..d25d2b90 100644
--- a/META.json
+++ b/META.json
@@ -102,6 +102,7 @@
             "YAML" : "0.84",
             "YAML::XS" : "0.41",
             "aliased" : "0",
+            "autovivification" : "0",
             "namespace::clean" : "0.24",
             "version" : "0.9902"
          }
@@ -117,7 +118,7 @@
    "provides" : {
       "App::Netdisco" : {
          "file" : "lib/App/Netdisco.pm",
-         "version" : "2.040002"
+         "version" : "2.040003"
       },
       "App::Netdisco::AnyEvent::Nbtstat" : {
          "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm"
@@ -531,6 +532,9 @@
       "App::Netdisco::Web::Plugin::Device::Ports" : {
          "file" : "lib/App/Netdisco/Web/Plugin/Device/Ports.pm"
       },
+      "App::Netdisco::Web::Plugin::Device::Vlans" : {
+         "file" : "lib/App/Netdisco/Web/Plugin/Device/Vlans.pm"
+      },
       "App::Netdisco::Web::Plugin::Inventory" : {
          "file" : "lib/App/Netdisco/Web/Plugin/Inventory.pm"
       },
@@ -796,6 +800,6 @@
       "x_IRC" : "irc://irc.freenode.org/#netdisco",
       "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users"
    },
-   "version" : "2.040002",
+   "version" : "2.040003",
    "x_serialization_backend" : "JSON::PP version 2.97001"
 }
diff --git a/META.yml b/META.yml
index 190948b6..42d85541 100644
--- a/META.yml
+++ b/META.yml
@@ -22,7 +22,7 @@ name: App-Netdisco
 provides:
   App::Netdisco:
     file: lib/App/Netdisco.pm
-    version: '2.040002'
+    version: '2.040003'
   App::Netdisco::AnyEvent::Nbtstat:
     file: lib/App/Netdisco/AnyEvent/Nbtstat.pm
   App::Netdisco::Backend::Job:
@@ -298,6 +298,8 @@ provides:
     file: lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
   App::Netdisco::Web::Plugin::Device::Ports:
     file: lib/App/Netdisco/Web/Plugin/Device/Ports.pm
+  App::Netdisco::Web::Plugin::Device::Vlans:
+    file: lib/App/Netdisco/Web/Plugin/Device/Vlans.pm
   App::Netdisco::Web::Plugin::Inventory:
     file: lib/App/Netdisco/Web/Plugin/Inventory.pm
   App::Netdisco::Web::Plugin::Report::ApChannelDist:
@@ -537,6 +539,7 @@ requires:
   YAML: '0.84'
   YAML::XS: '0.41'
   aliased: '0'
+  autovivification: '0'
   namespace::clean: '0.24'
   version: '0.9902'
 resources:
@@ -546,5 +549,5 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/bsd-license.php
   repository: https://github.com/netdisco/netdisco
-version: '2.040002'
+version: '2.040003'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm
index cd04fdf5..d88cdab0 100644
--- a/lib/App/Netdisco.pm
+++ b/lib/App/Netdisco.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use 5.010_000;
 
-our $VERSION = '2.040002';
+our $VERSION = '2.040003';
 use App::Netdisco::Configuration;
 
 =head1 NAME