diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index e2fc31283533..b7bdf6a4e0c1 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -1,14 +1,11 @@
-{stdenv, fetchurl, libgcrypt}:
-
-stdenv.mkDerivation {
-  name = "gnutls-1.1.23";
-  
-  src = fetchurl {
-    url = http://www.gnu.org/software/gnutls/releases/gnutls-1.1.23.tar.bz2;
-    sha256 = "0p5565rrinh1ajyphl9mljr3143mzall48vs02n3y03pv8srh7zh";
-  };
-
-  buildInputs = [libgcrypt];
+args: with args;
+stdenv.mkDerivation rec {
+	name = "gnutls-2.1.5";
+	src = fetchurl {
+		url = "${meta.homepage}/releases/${name}.tar.bz2";
+		sha256 = "0idkp54d1w1c6l17pl41p2mqabcb1qm2akhfmp4mxwa5mabkiyld";
+	};
+	buildInputs = [zlib lzo libgcrypt];
   
   meta = {
     description = "The GNU Transport Layer Security Library";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0412c880890..59d9ffef218f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1776,7 +1776,7 @@ rec {
   };
 
   gnutls = import ../development/libraries/gnutls {
-    inherit fetchurl stdenv libgcrypt;
+	  inherit fetchurl stdenv libgcrypt zlib lzo;
   };
 
   gpgme = import ../development/libraries/gpgme {