diff --git a/pkgs/development/libraries/openssl/builder.sh b/pkgs/development/libraries/openssl/builder.sh
deleted file mode 100644
index 0ec9de37d76..00000000000
--- a/pkgs/development/libraries/openssl/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-configureScript=./config
-configureFlags=shared
-
-postInstall=postInstall
-postInstall() {
-    # Bug fix: openssl does a `chmod 644' on the pkgconfig directory.
-    chmod 755 $out/lib/pkgconfig
-}
-
-genericBuild
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 709c78db1c7..4e683584587 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,11 +1,21 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation {
-  name = "openssl-0.9.8h";
-  builder = ./builder.sh;
+  name = "openssl-0.9.8i";
+  
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/security/openssl/openssl-0.9.8h.tar.gz;
-    sha1 = "ced4f2da24a202e01ea22bef30ebc8aee274de86";
+    url = http://www.openssl.org/source/openssl-0.9.8i.tar.gz;
+    sha1 = "b2e029cfb68bf32eae997d60317a40945db5a65f";
   };
+  
   buildInputs = [perl];
+
+  configureScript = "./config";
+  
+  configureFlags = "shared";
+
+  meta = {
+    homepage = http://www.openssl.org/;
+    description = "A cryptographic library that implements the SSL and TLS protocols";
+  };
 }