diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
new file mode 100644
index 000000000000..d7acc6778b4d
--- /dev/null
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pam }:
+
+stdenv.mkDerivation rec {
+  name = "google-authenticator-1.0";
+
+  src = fetchurl {
+    url = "https://google-authenticator.googlecode.com/files/libpam-${name}-source.tar.bz2";
+    sha1 = "017b7d89989f1624e360abe02d6b27a6298d285d";
+  };
+
+  buildInputs = [ pam ];
+
+  installPhase = ''
+    ensureDir $out/bin $out/lib/security
+    cp pam_google_authenticator.so $out/lib/security
+    cp google-authenticator $out/bin
+  '';
+
+  meta = {
+    homepage = https://code.google.com/p/google-authenticator/;
+    description = "Two-step verification, with pam module";
+    license = "ASL2.0";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d75c44d4827f..14ab58f03bbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -879,6 +879,8 @@ let
 
   gnuvd = callPackage ../tools/misc/gnuvd { };
 
+  googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
+
   gource = callPackage ../applications/version-management/gource {};
 
   gptfdisk = callPackage ../tools/system/gptfdisk { };