diff --git a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix
new file mode 100644
index 000000000000..9762358b80ef
--- /dev/null
+++ b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix
@@ -0,0 +1,29 @@
+args : with args; with builderDefs {src="";} null;
+	let localDefs = builderDefs {
+		src = /* put a fetchurl here */
+		fetchurl {
+			url = http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/fusesmb-0.8.7.tar.gz;
+			sha256 = "12gz2gn9iqjg27a233dn2wij7snm7q56h97k6gks0yijf6xcnpz1";
+		};
+
+		buildInputs = [samba fuse];
+		configureFlags = [];
+		postInstall = FullDepEntry 
+		(''
+		ensureDir $out/lib
+		ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0
+		'')
+		[ "minInit" "defEnsureDir" "doMakeInstall"];
+	} null; /* null is a terminator for sumArgs */
+	in with localDefs;
+stdenv.mkDerivation rec {
+	name = "smbfs-fuse-"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs 
+			[doConfigure doMakeInstall postInstall doForceShare doPropagate]);
+	meta = {
+		description = "
+		Samba mounted via FUSE.
+";
+	};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec6aa276b7e0..a90a182822a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -753,6 +753,13 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  smbfsFuseFun = lib.sumArgs (selectVersion ../tools/networking/smbfs-fuse) {
+    version = "0.8.7";
+    inherit builderDefs samba fuse;
+  };
+
+  smbfsFuse = smbfsFuseFun null;
+
   sudo = import ../tools/security/sudo {
     inherit fetchurl stdenv coreutils pam;
   };