diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eea8a658eb2a..3b47a2ed5938 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1892,6 +1892,8 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  fam = gamin;
+
   gamin = import ../development/libraries/gamin {
 	  inherit fetchurl stdenv python pkgconfig;
 	  inherit (gtkLibs) glib;
@@ -2049,6 +2051,9 @@ rec {
     inherit aspell;
   };
 
+  # TODO : Add MIT Kerberos and let admin choose.
+  kerberos = heimdal;
+
   heimdal = import ../development/libraries/kerberos/heimdal.nix {
 	  inherit fetchurl stdenv readline db4 openssl openldap cyrus_sasl;
   };