diff --git a/doc/Makefile.am b/doc/Makefile.am
index f18befc4..00f4bfce 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST = design.dia sample.config scripts/ocserv-script sample.passwd \
-	systemd/ocserv.service systemd/ocserv.socket \
+	systemd/socket-activated/ocserv.service  systemd/standalone/ocserv.service \
+	systemd/socket-activated/ocserv.socket \
 	dbus/org.infradead.ocserv.conf
 
 dist_man_MANS = ocserv.8 ocpasswd.8 occtl.8
@@ -21,5 +22,4 @@ ocpasswd.8: ../src/ocpasswd-args.def
 
 install-data-local:
 	-test -d "$(DBUS_CONFIG_DIR)" && $(INSTALL_DATA) dbus/org.infradead.ocserv.conf $(DBUS_CONFIG_DIR)
-	-test -d "/usr/lib/systemd/system/" && $(INSTALL_DATA) systemd/ocserv.service /usr/lib/systemd/system/
-	-test -d "/usr/lib/systemd/system/" && $(INSTALL_DATA) systemd/ocserv.socket /usr/lib/systemd/system/
+	-test -d "/usr/lib/systemd/system/" && $(INSTALL_DATA) systemd/standalone/ocserv.service /usr/lib/systemd/system/
diff --git a/doc/systemd/ocserv.service b/doc/systemd/socket-activated/ocserv.service
similarity index 100%
rename from doc/systemd/ocserv.service
rename to doc/systemd/socket-activated/ocserv.service
diff --git a/doc/systemd/ocserv.socket b/doc/systemd/socket-activated/ocserv.socket
similarity index 100%
rename from doc/systemd/ocserv.socket
rename to doc/systemd/socket-activated/ocserv.socket
diff --git a/doc/systemd/standalone/ocserv.service b/doc/systemd/standalone/ocserv.service
new file mode 100644
index 00000000..86fca912
--- /dev/null
+++ b/doc/systemd/standalone/ocserv.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=OpenConnect SSL VPN server
+Documentation=man:ocserv(8)
+After=syslog.target
+After=network.target
+After=dbus.service
+
+[Service]
+PrivateTmp=true
+Type=forking
+PIDFile=/var/run/ocserv.pid
+ExecStart=/usr/sbin/ocserv --pid-file /var/run/ocserv.pid --config /etc/ocserv/ocserv.conf
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target