diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf
index c8def059..3e687c21 100644
--- a/doc/config/lighttpd.conf
+++ b/doc/config/lighttpd.conf
@@ -104,6 +104,12 @@ server.use-ipv6 = "enable"
 server.username  = "lighttpd"
 server.groupname = "lighttpd"
 
+##
+## Enable lighttpd to serve requests on sockets received from systemd
+## https://www.freedesktop.org/software/systemd/man/systemd.socket.html
+##
+#server.systemd-socket-activation = "enable"
+
 ## 
 ## enable core files.
 ##
diff --git a/doc/systemd/Makefile.am b/doc/systemd/Makefile.am
index 665f164b..5e504e8a 100644
--- a/doc/systemd/Makefile.am
+++ b/doc/systemd/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST=lighttpd.service
+EXTRA_DIST=lighttpd.service lighttpd.socket
diff --git a/doc/systemd/lighttpd.socket b/doc/systemd/lighttpd.socket
new file mode 100644
index 00000000..7e0e5844
--- /dev/null
+++ b/doc/systemd/lighttpd.socket
@@ -0,0 +1,16 @@
+# please note: lighttpd.conf must contain directive:
+#   server.systemd-socket-activation = "enable"
+
+[Unit]
+Description=lighttpd socket
+
+[Socket]
+# Enable listening on http port
+ListenStream=80
+# To enable listening on https port, lighttpd config needs SSL setup
+# https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_SSL
+#ListenStream=443
+Service=lighttpd.service
+
+[Install]
+WantedBy=sockets.target