diff --git a/pkgs/tools/security/gnupg2/default.nix b/pkgs/tools/security/gnupg2/default.nix
new file mode 100644
index 00000000000..f6e22bec51d
--- /dev/null
+++ b/pkgs/tools/security/gnupg2/default.nix
@@ -0,0 +1,16 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "gnupg-2.0.8";
+  src = fetchurl {
+    url = ftp://ftp.cert.dfn.de/pub/tools/crypt/gcrypt/gnupg/gnupg-2.0.8.tar.bz2;
+    sha256 = "04v9s92xph1hrhac49yyrgzdwjqshs2zawvjbi3jc2klwjpi1wqn";
+  };
+  buildInputs = [ readline openldap bzip2 zlib libgpgerror pth libgcrypt
+    libassuan libksba libusb curl ];
+
+  meta = {
+    description = "A free implementation of the OpenPGP standard for encrypting
+	and signing data, v2";
+    homepage = http://www.gnupg.org/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64738d73ca2..74899af32c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -495,6 +495,11 @@ rec {
     ideaSupport = true; # enable for IDEA crypto support
   };
 
+  gnupg2 = import ../tools/security/gnupg2 {
+	  inherit fetchurl stdenv readline openldap bzip2 zlib libgpgerror pth
+	    libgcrypt libassuan libksba libusb curl;
+  };
+
   gnuplot = import ../tools/graphics/gnuplot {
     inherit fetchurl stdenv zlib gd texinfo;
   };