diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24fc702196b0..08c361d9cecc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3933,6 +3933,10 @@ let pkgs = rec {
     inherit fetchurl stdenv mkDerivationByConfiguration perl lib;
   };
 
+  squidHead = import ../servers/squid/3.head.nix {
+    inherit fetchurl stdenv mkDerivationByConfiguration perl lib;
+  };
+
   tomcat5 = import ../servers/http/tomcat {
     inherit fetchurl stdenv jdk;
   };
@@ -5292,6 +5296,15 @@ let pkgs = rec {
     gtksharp = gtksharp1;
   };
 
+  funpidgin = builderDefsPackage (selectVersion ../applications/networking/instant-messengers/funpidgin "2.4.1") {
+    inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
+      gtkspell aspell gettext ncurses;
+    GStreamer = gst_all.gstreamer;
+    inherit (gtkLibs) gtk;
+    inherit (gnome) startupnotification;
+    inherit (xlibs) libXScrnSaver scrnsaverproto libX11 xproto;
+  } null;
+
   gimp = import ../applications/graphics/gimp {
     inherit fetchurl stdenv pkgconfig freetype fontconfig
       libtiff libjpeg libpng libexif zlib perl perlXMLParser
diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix
index ee7aafbdd25a..7773b3da6d7f 100644
--- a/pkgs/top-level/builder-defs.nix
+++ b/pkgs/top-level/builder-defs.nix
@@ -17,6 +17,9 @@ args: with args; with stringsWithDeps; with lib;
 		else if (hasSuffixHack "-cvs-export" s) then "cvs-dir"
 		else if (hasSuffixHack ".nar.bz2" s) then "narbz2"
 
+		# Mostly for manually specified directories..
+		else if (hasSuffixHack "/" s) then "dir"
+
 		# Last block - for single files!! It should be always after .tar.*
 		else if (hasSuffixHack ".bz2" s) then "plain-bz2"
 
@@ -195,6 +198,10 @@ args: with args; with stringsWithDeps; with lib;
 		cp -r '${s}' .
 		cd \$(basename ${s})
 		chmod u+rwX -R .
+	" else if (archiveType s) == "dir" then "
+		cp -r '${s}' .
+		cd \$(basename ${s})
+		chmod u+rwX -R .
 	" else if (archiveType s) == "narbz2" then "
 		bzip2 <${s} | nix-store --restore \$PWD/\$(basename ${s} .nar.bz2)
 		cd \$(basename ${s} .nar.bz2)