diff --git a/srcpkgs/openssh-server b/srcpkgs/openssh-server
deleted file mode 120000
index dc275a7a7e1..00000000000
--- a/srcpkgs/openssh-server
+++ /dev/null
@@ -1 +0,0 @@
-openssh
\ No newline at end of file
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index a9f6f36dc8a..1fe977f2a07 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,9 +1,7 @@
 # Template file for 'openssh'
-_desc="The OpenSSH implementation of SSH protocol"
-
 pkgname=openssh
 version=6.7p1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -12,9 +10,10 @@ configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
  --with-pid-dir=/run --with-pam --with-pie --without-kerberos5 LD=$CC"
 hostmakedepends="automake libtool perl"
 makedepends="zlib-devel libressl-devel pam-devel"
-short_desc="${_desc} - client"
-replaces="openssh-client<6.1p1"
-conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/pam.d/sshd"
+short_desc="The OpenSSH implementation of SSH protocol"
+replaces="openssh-server>=0"
+conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd"
+make_dirs="/var/chroot/ssh 0755 root root"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.openssh.org"
 license="BSD"
@@ -33,7 +32,6 @@ pre_configure() {
 	fi
 	autoreconf -fi
 }
-
 post_install() {
 	vinstall contrib/sshd.pam.generic 644 etc/pam.d sshd
 	vinstall contrib/ssh-copy-id 755 usr/bin
@@ -48,28 +46,10 @@ post_install() {
 		${DESTDIR}/etc/ssh/sshd_config
 
 	vinstall ${FILESDIR}/sshd.pam 644 etc/pam.d sshd
-}
-
-openssh-server_package() {
-	conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd"
-	make_dirs="/var/chroot/ssh 0755 root root"
-	replaces="runit-void<20141013_2"
-	depends="openssh>=$version"
-	short_desc="${_desc} - server"
-	pkg_install() {
-		vmove usr/libexec/sftp-server
-		vmove etc/ssh/sshd_config
-		vmove usr/sbin
-		vmove usr/share/man/man5/sshd_config.5
-		for f in sftp-server sshd; do
-			vmove usr/share/man/man8/${f}.8
-		done
-		vmove etc/pam.d
-		if [ "$build_option_systemd" ]; then
-			vmkdir usr/lib/systemd/system
-			install -m644 ${FILESDIR}/*.{socket,service} \
-				${PKGDESTDIR}/usr/lib/systemd/system
-		fi
-		vsv sshd
-	}
+	if [ "$build_option_systemd" ]; then
+		vmkdir usr/lib/systemd/system
+		install -m644 ${FILESDIR}/*.{socket,service} \
+			${PKGDESTDIR}/usr/lib/systemd/system
+	fi
+	vsv sshd
 }