diff --git a/pkgs/applications/networking/browsers/uzbl/experimental.nix b/pkgs/applications/networking/browsers/uzbl/experimental.nix
new file mode 100644
index 00000000000..0727542436f
--- /dev/null
+++ b/pkgs/applications/networking/browsers/uzbl/experimental.nix
@@ -0,0 +1,34 @@
+a :  
+let 
+  s = import ./src-for-experimental.nix;
+  buildInputs = with a; [
+    libsoup pkgconfig webkit gtk makeWrapper
+  ];
+in
+rec {
+  src = (a.fetchGitFromSrcInfo s) + "/";
+
+  inherit (s) name;
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["addInputs" "doMakeInstall" "doWrap"];
+      
+  doWrap = a.makeManyWrappers "$out/bin/uzbl*" 
+    ''
+      --prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
+      --prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsBase}/lib/gstreamer-* \
+      --prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsGood}/lib/gstreamer-* \
+      --prefix GST_PLUGIN_PATH : ${a.webkit.gstFfmpeg}/lib/gstreamer-* 
+    '';
+
+  installFlags = "PREFIX=$out";
+
+  meta = {
+    description = "Tiny externally controllable webkit browser";
+    maintainers = [a.lib.maintainers.raskin];
+    platforms = with a.lib.platforms; 
+      linux ++ freebsd ++ darwin;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix b/pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix
new file mode 100644
index 00000000000..68cc9b0f116
--- /dev/null
+++ b/pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix
@@ -0,0 +1,9 @@
+rec {
+   version="327db778f3a5446d57969bb6ce1e038799aa86aa";
+   name="uzbl-experimental-327db778f3a5446d57969bb6ce1e038799aa86aa";
+   hash="eadf0286dc2d7111f765d43805324d6e72a536a1490edbb6791c2e148aeaffc2";
+   rev="327db778f3a5446d57969bb6ce1e038799aa86aa";
+   url="git://github.com/Dieterbe/uzbl.git";
+  
+  
+}
diff --git a/pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix b/pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix
new file mode 100644
index 00000000000..60750f7b90b
--- /dev/null
+++ b/pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix
@@ -0,0 +1,6 @@
+{
+  repoUrl = "git://github.com/Dieterbe/uzbl.git";
+  baseName = "uzbl-experimental";
+  method = "fetchgit";
+  rev = "origin/experimental";
+}
diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index e53b0261855..20f7c8cd075 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
    */
   doCheck = false;
 
+  passthru = {
+    inherit perl python jdk guile;
+  };
+
   meta = {
     description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7cfda3d87bc..72a742402e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7564,6 +7564,14 @@ let
     glib = gtkLibs.glib;
   };
 
+  uzblExperimental = builderDefsPackage 
+        (import ../applications/networking/browsers/uzbl/experimental.nix) {
+    inherit pkgconfig webkit makeWrapper;
+    inherit (gtkLibs) gtk;
+    libsoup = gnome26.libsoup;
+    glib = gtkLibs.glib;
+  };
+
   valknut = import ../applications/networking/p2p/valknut {
     inherit fetchurl stdenv perl x11 libxml2 libjpeg libpng openssl dclib;
     qt = qt3;