diff --git a/srcpkgs/openssh/files/sshd.service b/srcpkgs/openssh/files/sshd.service
deleted file mode 100644
index fdddf3753e1..00000000000
--- a/srcpkgs/openssh/files/sshd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-# Note that this is the service file for running a single SSH server for all
-# incoming connections, suitable only for systems with a large amount of SSH
-# traffic. In almost all other cases it is a better idea to use sshd.socket +
-# sshd@.service (i.e. the on-demand spawning version for one instance per
-# connection).
-
-[Unit]
-Description=SSH Secure Shell Service
-Wants=sshdgenkeys.service
-After=sshdgenkeys.service
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/sshd -D
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/openssh/files/sshd.socket b/srcpkgs/openssh/files/sshd.socket
deleted file mode 100644
index e09e328690f..00000000000
--- a/srcpkgs/openssh/files/sshd.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Conflicts=sshd.service
-Wants=sshdgenkeys.service
-
-[Socket]
-ListenStream=22
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/srcpkgs/openssh/files/sshd@.service b/srcpkgs/openssh/files/sshd@.service
deleted file mode 100644
index 2fd9b08140a..00000000000
--- a/srcpkgs/openssh/files/sshd@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=OpenSSH Per-Connection Daemon
-After=sshdgenkeys.service
-
-[Service]
-ExecStart=-/usr/sbin/sshd -i
-StandardInput=socket
-StandardError=syslog
diff --git a/srcpkgs/openssh/files/sshdgenkeys.service b/srcpkgs/openssh/files/sshdgenkeys.service
deleted file mode 100644
index 0962d844851..00000000000
--- a/srcpkgs/openssh/files/sshdgenkeys.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=OpenSSH server Key Generation
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key
-ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_key
-ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/ssh-keygen -A
-RemainAfterExit=yes
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 840c70e47d6..f2223fc0088 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=6.8p1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -24,7 +24,7 @@ distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.
 checksum=3ff64ce73ee124480b5bf767b9830d7d3c03bbcb6abe716b78f0192c37ce160e
 
 # Package build options
-build_options="systemd openssh_identitypersist ldns ssl"
+build_options="openssh_identitypersist ldns ssl"
 build_options_default="ldns ssl"
 desc_option_openssh_identitypersist="add key to ssh-agent(1) upon connecting"
 
@@ -48,10 +48,5 @@ post_install() {
 		${DESTDIR}/etc/ssh/sshd_config
 
 	vinstall ${FILESDIR}/sshd.pam 644 etc/pam.d sshd
-	if [ "$build_option_systemd" ]; then
-		vmkdir usr/lib/systemd/system
-		install -m644 ${FILESDIR}/*.{socket,service} \
-			${PKGDESTDIR}/usr/lib/systemd/system
-	fi
 	vsv sshd
 }