diff --git a/Netdisco/Changes b/Netdisco/Changes
index b7f67e8d..d2235b73 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,3 +1,9 @@
+2.034000
+
+  [ENHANCEMENTS]
+
+  * Add systemd guide
+
 2.033006 - 2016-03-20
 
   [ENHANCEMENTS]
diff --git a/Netdisco/lib/App/Netdisco/Manual/Systemd.pod b/Netdisco/lib/App/Netdisco/Manual/Systemd.pod
new file mode 100644
index 00000000..38b10aad
--- /dev/null
+++ b/Netdisco/lib/App/Netdisco/Manual/Systemd.pod
@@ -0,0 +1,70 @@
+=head1 NAME
+
+App::Netdisco::Manual::Systemd - Systemd install tips
+
+=head1 Introduction
+
+This page documents Netdisco running under systemd. Thanks to Aurelien Guerson
+and Stuart Kendrick for offering this solution. Please check these
+instructions apply to your local installation and use at your own risk.
+
+=head1 Files
+
+=head2 C<< /etc/systemd/system/netdisco-daemon.service >>
+
+This should be set mode 644 and owned by user and group C<root>.
+
+  [Unit]
+  Description=Netdisco Daemon Service
+  AssertFileIsExecutable=/home/netdisco/bin/netdisco-daemon
+  After=syslog.target network-online.target
+  
+  [Service]
+  Type=forking
+  User=netdisco
+  Group=netdisco
+  ExecStart=/home/netdisco/bin/netdisco-daemon start
+  ExecStop=/home/netdisco/bin/netdisco-daemon stop
+  Restart=on-failure
+  RestartSec=60
+  
+  [Install]
+  WantedBy=multi-user.target
+
+=head2 C<< /etc/systemd/system/netdisco-web.service >>
+
+This should be set mode 644 and owned by user and group C<root>.
+
+  [Unit]
+  Description=Netdisco Web Service
+  AssertFileIsExecutable=/home/netdisco/bin/netdisco-web
+  After=syslog.target network-online.target netdisco-daemon.service
+  
+  [Service]
+  Type=forking
+  User=netdisco
+  Group=netdisco
+  ExecStart=/home/netdisco/bin/netdisco-web start
+  ExecStop=/home/netdisco/bin/netdisco-web stop
+  Restart=on-failure
+  RestartSec=60
+  
+  [Install]
+  WantedBy=multi-user.target
+
+=head1 Commands
+
+To enable Netdisco in systemd:
+
+ systemctl enable netdisco-daemon.service
+ systemctl enable netdisco-web.service
+
+To start Netdisco:
+
+ systemctl start netdisco-daemon.service
+ systemctl start netdisco-web.service
+
+May also need to run C<systemctl daemon-reload> depending on the order you do
+these steps.
+
+=cut
diff --git a/Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod b/Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod
index f298f481..1d87c703 100644
--- a/Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod
+++ b/Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod
@@ -151,4 +151,9 @@ 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