diff --git a/Netdisco/Changes b/Netdisco/Changes
index e880c575..18fa7bf8 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -3,6 +3,7 @@
   [ENHANCEMENTS]
 
   * Display port descriptions in topology editing form
+  * Support store_modules config (default true)
 
 2.013001 - 2013-08-23
 
diff --git a/Netdisco/lib/App/Netdisco/Core/Macsuck.pm b/Netdisco/lib/App/Netdisco/Core/Macsuck.pm
index 071e9a7c..31b2c567 100644
--- a/Netdisco/lib/App/Netdisco/Core/Macsuck.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Macsuck.pm
@@ -39,7 +39,7 @@ without a neighbor.
 If the device has VLANs, C<do_macsuck> will walk each VALN to get the MAC
 addresses from there.
 
-It will also gather wireless client information if C<store_wireless_client>
+It will also gather wireless client information if C<store_wireless_clients>
 configuration setting is enabled.
 
 =cut
@@ -378,7 +378,7 @@ clients.
 If the device doesn't support the 802.11 MIBs, then this will silently return.
 
 If the device does support the 802.11 MIBs but Netdisco's configuration
-does not permit polling (C<store_wireless_client> must be true) then a debug
+does not permit polling (C<store_wireless_clients> must be true) then a debug
 message is logged and the subroutine returns.
 
 Otherwise, client information is gathered and stored to the database.
@@ -395,7 +395,7 @@ sub store_wireless_client_info {
   my $cd11_txrate = $snmp->cd11_txrate;
   return unless $cd11_txrate and scalar keys %$cd11_txrate;
 
-  if (setting('store_wireless_client')) {
+  if (setting('store_wireless_clients')) {
       debug sprintf ' [%s] macsuck - gathering wireless client info',
         $device->ip;
   }
diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm
index 45f04d7e..bfd96ee3 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm
@@ -72,7 +72,7 @@ sub discover {
   store_wireless($device, $snmp);
   store_vlans($device, $snmp);
   store_power($device, $snmp);
-  store_modules($device, $snmp);
+  store_modules($device, $snmp) if setting('store_modules');
   discover_new_neighbors($device, $snmp);
 
   # if requested, and the device has not yet been arpniped/macsucked, queue now
diff --git a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
index 858e9882..6122babd 100644
--- a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
+++ b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
@@ -329,7 +329,7 @@ Set to true will let nodes accumulate on uplink ports without topology
 information. This is a debug option to help you figure out your topology and
 generally should not be set.
 
-=head3 C<store_wireless_client>
+=head3 C<store_wireless_clients>
 
 Value: Boolean. Default: C<true>.
 
@@ -337,6 +337,13 @@ Set to false to skip the wireless client information gathering. This is
 captured at macsuck time, so if you aren't using the information you can skip
 it.
 
+=head3 C<store_modules>
+
+Value: Boolean. Default: C<true>.
+
+Set to false to skip the module inventory on device discovery. On some
+platforms this can double the discovery time.
+
 =head3 C<ignore_interfaces>
 
 Value: List of Strings. Default:
@@ -555,10 +562,6 @@ These settings are from Netdisco 1.x but are yet to be supported in Netdisco
 
 =item *
 
-C<admin>
-
-=item *
-
 C<arpnip_min_age>
 
 =item *
@@ -659,10 +662,6 @@ C<snmpforce_v3>
 
 =item *
 
-C<store_modules>
-
-=item *
-
 C<timeout>
 
 =item *
@@ -677,14 +676,6 @@ C<v3_users>
 
 C<v3_users_rw>
 
-=item *
-
-C<web_console_models>
-
-=item *
-
-C<web_console_vendors>
-
 =back
 
 =cut
diff --git a/Netdisco/share/config.yml b/Netdisco/share/config.yml
index 78fc4f84..de1d39e0 100644
--- a/Netdisco/share/config.yml
+++ b/Netdisco/share/config.yml
@@ -67,7 +67,8 @@ discover_no_type: []
 macsuck_all_vlans: false
 macsuck_no_unnamed: false
 macsuck_bleed: false
-store_wireless_client: true
+store_wireless_clients: true
+store_modules: true
 ignore_interfaces:
   - 'EOBC'
   - 'unrouted VLAN'