diff --git a/pkgs/development/libraries/kerberos/heimdal-1.5.2.nix b/pkgs/development/libraries/kerberos/heimdal-1.5.2.nix
new file mode 100644
index 000000000000..19d4a7893f22
--- /dev/null
+++ b/pkgs/development/libraries/kerberos/heimdal-1.5.2.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} :
+
+stdenv.mkDerivation rec {
+  name = "heimdal-1.5.2";
+
+  src = fetchurl {
+    urls = [
+      "http://www.h5l.org/dist/src/${name}.tar.gz"
+      "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
+    ];
+    sha256 = "22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec";
+  };
+
+  ## ugly, X should be made an option
+  configureFlags = [
+    "--with-openldap=${openldap}"
+    "--with-sqlite3=${sqlite}"
+    "--without-x"
+  ];
+  # dont succeed with --libexec=$out/sbin, so
+  postInstall = ''
+    mv $out/libexec/* $out/sbin/
+    rmdir $out/libexec
+  '';
+
+  propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl sqlite];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acfdf6170abe..0f274fbb39a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4107,13 +4107,17 @@ let
   gwenhywfar = callPackage ../development/libraries/gwenhywfar { };
 
   # TODO : Add MIT Kerberos and let admin choose.
-  kerberos = heimdal;
+  kerberos = heimdal_1_5_2;
+
+  heimdal = heimdal_1_5_2;
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };
 
   hawknl = callPackage ../development/libraries/hawknl { };
 
-  heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
+  heimdal_1_3_3 = callPackage ../development/libraries/kerberos/heimdal.nix { };
+
+  heimdal_1_5_2 = callPackage ../development/libraries/kerberos/heimdal-1.5.2.nix { };
 
   herqq = callPackage ../development/libraries/herqq { };