diff --git a/pkgs/desktops/kde-4/libs/default.nix b/pkgs/desktops/kde-4/libs/default.nix
index 4c0574c9c74..83224a9a13e 100644
--- a/pkgs/desktops/kde-4/libs/default.nix
+++ b/pkgs/desktops/kde-4/libs/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 	libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile zlib
 	perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
     libtool freetype bzip2 shared_mime_info alsaLib libungif cups
-	gettext enchant openexr aspell stdenv.gcc.libc jasper
+	gettext enchant openexr aspell stdenv.gcc.libc jasper heimdal
   ] ++ kdesupport.all;
   buildInputs = [ cmake ];
   patchPhase = "cp ${findIlmBase} ../cmake/modules/FindIlmBase.cmake;
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
new file mode 100644
index 00000000000..4564021d149
--- /dev/null
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -0,0 +1,12 @@
+args: with args;
+stdenv.mkDerivation rec {
+	name = "heimdal-1.0.2";
+
+	src = fetchurl {
+		url = "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz";
+		sha256 = "1h4x41lpv2abpv5l3yjd58pfzs0kkp5sbnih9iykhwd6sii1iig5";
+	};
+
+	configureFlags = "--enable-shared --disable-static --with-openldap=${openldap}";
+	buildInputs = [ readline db4 openssl openldap cyrus_sasl ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f6440f89c9..e1a3fa240c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1948,6 +1948,10 @@ rec {
     inherit aspell;
   };
 
+  heimdal = import ../development/libraries/kerberos/heimdal.nix {
+	  inherit fetchurl stdenv readline db4 openssl openldap cyrus_sasl;
+  };
+
   hsqldb = import ../development/libraries/java/hsqldb {
     inherit stdenv fetchurl unzip;
   };
@@ -4677,7 +4681,7 @@ rec {
     inherit
       fetchurl fetchsvn zlib perl openssl pcre pkgconfig libjpeg libpng libtiff
       libxml2 libxslt libtool libusb expat freetype bzip2 cmake cluceneCore libgcrypt gnupg
-	  cppunit cyrus_sasl openldap enchant exiv2 samba nss log4cxx aspell
+	  cppunit cyrus_sasl openldap enchant exiv2 samba nss log4cxx aspell heimdal
       shared_mime_info alsaLib libungif cups mesa boost gpgme gettext redland
 	  xineLib libgphoto2 djvulibre libogg flac lame libvorbis poppler readline
 	  saneBackends chmlib python libzip gmp sqlite libidn runCommand lib