diff --git a/Netdisco/Changes b/Netdisco/Changes
index f3fcb80f..dee513c0 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -4,6 +4,10 @@
 
   * Add validate_remote_user setting to check proxied users are known
 
+  [ENHANCEMENTS]
+
+  * Add Linux SNMP, LLDP setup docs (S. Hobson)
+
   [BUG FIXES]
 
   * Remove some odd behaviour of cached SNMP config hints (L. Ferguson)
diff --git a/Netdisco/lib/App/Netdisco/Manual/Deployment.pod b/Netdisco/lib/App/Netdisco/Manual/Deployment.pod
index b0fde303..d8e56f5e 100644
--- a/Netdisco/lib/App/Netdisco/Manual/Deployment.pod
+++ b/Netdisco/lib/App/Netdisco/Manual/Deployment.pod
@@ -9,8 +9,11 @@ The Netdisco applications will generate RC scripts suitable for Linux systems:
  bin/netdisco-web get_init_file
  bin/netdisco-daemon get_init_file
 
-If you'd like to send a patch for BSD, please submit it against the
-L<Daemon::Control> distribution.
+On C<systemd>-based systems please see L<our systemd
+guide|App::Netdisco::Manual::Systemd>.
+
+On BSD systems please see L<our BSD tips|App::Netdisco::Manual::BSDInstall>,
+and submit patches against the L<Daemon::Control> distribution.
 
 =head1 Enable MD5 authentication to PostgreSQL
 
diff --git a/Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod b/Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod
index cfe9e29c..139b1b20 100644
--- a/Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod
+++ b/Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod
@@ -73,6 +73,12 @@ types C<discoverall>, C<macwalk>, C<arpwalk>, and C<nbtwalk> will enqueue one
 corresponding single-device job for each known device. The Netdisco backend
 daemon will then process the queue (in a random order).
 
+=head1 My Device details look all wrong!
+
+See the tips at L<Vendors Guide|App::Netdisco::Manual::Vendors>, or else
+contact the L<community email
+list|https://lists.sourceforge.net/lists/listinfo/netdisco-users>.
+
 =head1 Run a C<netdisco-do> Task with Debugging
 
 The C<netdisco-do> command has several debug flags which will show what's
@@ -146,25 +152,4 @@ community string to improve performance. To work around this, delete the
 device (either in the web GUI or using C<netdisco-do> at the command line),
 and then re-discover it.
 
-=head1 Neighbor Relations on Juniper EX
-
-The LLDP configuration should look like:
-
- lldp {
-   management-address 10.0.0.1;
-   port-id-subtype interface-name;
-   interface all;
- }
-
-=head1 Report Cisco 37xx as Single Device Instead of Stacked
-
-Add this to your 37xx config:
-
- no snmp-server sysobjectid type stack-oid
-
-=head1 Running under C<systemd>
-
-On C<systemd>-based systems please see L<our Systemd
-guide|App::Netdisco::Manual::Systemd>.
-
 =cut
diff --git a/Netdisco/lib/App/Netdisco/Manual/Vendors.pod b/Netdisco/lib/App/Netdisco/Manual/Vendors.pod
new file mode 100644
index 00000000..d7e492bb
--- /dev/null
+++ b/Netdisco/lib/App/Netdisco/Manual/Vendors.pod
@@ -0,0 +1,50 @@
+=head1 NAME
+
+App::Netdisco::Manual::Vendors - Tips and Tricks for Vendor Platforms
+
+=head1 Neighbor Relations on Juniper EX
+
+The LLDP configuration should look like:
+
+ lldp {
+   management-address 10.0.0.1;
+   port-id-subtype interface-name;
+   interface all;
+ }
+
+=head1 Report Cisco 37xx as Single Device Instead of Stacked
+
+Add this to your 37xx config:
+
+ no snmp-server sysobjectid type stack-oid
+
+=head1 Linux SNMP Service (Agent)
+
+Install the C<snmpd> (SNMP agent) and C<lldpd> (neighbor discovery) packages.
+
+Edit the C</etc/snmp/snmpd.conf> file:
+
+ # AGENT BEHAVIOUR
+ # comment out: agentAddress udp:127.0.0.1:161
+ agentAddress udp:161,udp6:[::1]:161
+ 
+ # ACCESS CONTROL
+ rocommunity <your-secret> <management-device-IP/net>
+ 
+ # SYSTEM INFORMATION
+ sysServices 76
+ # (default is 72, 74 is layer2 bridge/switch, 76 for layer3 router/gateway)
+
+If running a firewall, allow SNMP traffic in on UDP port 161.
+
+Edit the C</etc/default/lldpd> file:
+
+ DAEMON_ARGS="-k -x -l -m <Mgmt-IP>"
+ # <Mgmt-IP> is the IP to advertise for Netdisco to connect
+
+Restart C<snmpd> and C<lldpd> services when you have configured them.
+
+This assumes you're using LLDP on your network. If you use CDP then the
+C<lldpd> daemon can support that protocol - see the manual page for details.
+
+=cut