diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index a023e1ceea9b..2121449af5ac 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation rec {
   name = "libedit-20090923-3.0";
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "02j66qbd1c9wfghpjb8dzshkcj4i0n9xanxy81552j3is9ilxjka";
   };
 
+  postInstall = ''
+    sed -i s/-lcurses/-lncurses/g $out/lib/pkgconfig/libedit.pc
+  '';
+
   propagatedBuildInputs = [ ncurses ];
 
   meta = {
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 57e0f50a243b..e511ec415a25 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, openssl, perl
+{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig
 , pamSupport ? false, pam ? null
 , etcDir ? null
 , hpnSupport ? false
@@ -16,11 +16,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openssh-5.4p1";
+  name = "openssh-5.5p1";
 
   src = fetchurl {
-    url = "ftp://ftp.nluug.nl/pub/security/OpenSSH/${name}.tar.gz";
-    sha256 = "0kj0qp43dn2pnkcgrbbhm2r9db448ppsmmzh22mj8j0h0h6yg5mf";
+    url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/${name}.tar.gz";
+    sha256 = "12kywhjnz6w6kx5fk526fhs2xc7rf234hwrms9p1hqv6zrpdvvin";
   };
 
   patchPhase = stdenv.lib.optionalString hpnSupport
@@ -29,12 +29,13 @@ stdenv.mkDerivation rec {
     '';
   
   buildInputs =
-    [ zlib openssl perl ]
+    [ zlib openssl perl libedit pkgconfig ]
     ++ stdenv.lib.optional pamSupport pam;
 
   configureFlags =
     ''
       --with-mantype=man
+      --with-libedit=yes
       ${if pamSupport then "--with-pam" else "--without-pam"}
       ${if etcDir != null then "--sysconfdir=${etcDir}" else ""}
     '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8b5c14c896b..f34cb0c82185 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1274,7 +1274,7 @@ let
   };
 
   openssh = import ../tools/networking/openssh {
-    inherit fetchurl stdenv zlib openssl pam perl;
+    inherit fetchurl stdenv zlib openssl pam perl libedit pkgconfig;
     pamSupport = getPkgConfig "openssh" "pam" true;
     hpnSupport = getPkgConfig "openssh" "hpn" false;
     etcDir = getPkgConfig "openssh" "etcDir" "/etc/ssh";