diff --git a/srcpkgs/openssh/openssh-server.template b/srcpkgs/openssh/openssh-server.template
index 239aed3ee5..81a3ff5bd3 100644
--- a/srcpkgs/openssh/openssh-server.template
+++ b/srcpkgs/openssh/openssh-server.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains the ${pkgname} server files."
 
-revision=2
 conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd"
 openrc_services="sshd default true"
 
diff --git a/srcpkgs/openssh/patches/disable_check_config.diff b/srcpkgs/openssh/patches/disable_check_config.diff
deleted file mode 100644
index 95c0e5b0d6..0000000000
--- a/srcpkgs/openssh/patches/disable_check_config.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2009-03-08 19:04:14.598965190 +0100
-+++ Makefile.in	2009-03-08 19:04:27.324968206 +0100
-@@ -232,7 +232,7 @@ distprep: catman-do
- 	-rm -rf autom4te.cache
- 	(cd scard && $(MAKE) -f Makefile.in distprep)
- 
--install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
-+install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf host-key
- install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf
- install-nosysconf: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files
- 
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 92596f927d..79dabb784a 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,19 +1,18 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=5.8p2
-revision=1
+version=5.9p1
 distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--libexecdir=/usr/libexec/openssh --with-tcp-wrappers
 --datadir=/usr/share/openssh --sysconfdir=/etc/ssh --without-selinux
 --with-privsep-user=nobody --with-pam --with-mantype=man --without-rpath
 --with-xauth=/usr/bin/xauth --with-ssl-engine --disable-strip
---with-privsep-path=/var/chroot/ssh --with-kerberos5=/usr --with-rand-helper"
+--with-privsep-path=/var/chroot/ssh --with-kerberos5=/usr"
 short_desc="The OpenSSH implementation of SSH protocol versions 1 and 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.openssh.org"
 license="BSD"
-checksum=5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314
+checksum=8d3e8b6b6ff04b525a6dfa6fdeb6a99043ccf6c3310cc32eba84c939b07777d5
 long_desc="
  SSH (Secure SHell) is a program for logging into and executing
  commands on a remote machine. SSH is intended to replace rlogin and
@@ -35,6 +34,7 @@ subpackages="$pkgname-client $pkgname-server"
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run libssl
+Add_dependency run shadow
 
 Add_dependency build perl ">=0"
 Add_dependency build tcp_wrappers-devel
@@ -43,7 +43,6 @@ Add_dependency build openssl-devel
 Add_dependency build pam-devel
 Add_dependency build mit-krb5-devel
 Add_dependency build e2fsprogs-devel
-Add_dependency full shadow
 
 post_install()
 {