diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index 5f8ba337eab..faae21bd8a2 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -14,21 +14,22 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "samba-3.3.3";
+  name = "samba-3.5.2";
 
   src = fetchurl {
     url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz";
-    sha256 = "08x3ng7ls5c1a95v7djx362i55wdlmnvarpr7rhng5bb55s9n5qn";
+    sha256 = "0pi946lyn57larvada77pkal48hc0rn07bjxpg2ahz0c389cknl2";
   };
 
   buildInputs = [readline pam openldap popt iniparser libunwind fam acl]
     ++ stdenv.lib.optional useKerberos kerberos;
 
-  preConfigure = "cd source";
+  preConfigure = "cd source3";
 
-  postInstall = if configDir == ""
-    then "touch $out/lib/smb.conf"
-    else "";
+  postInstall = ''
+    mkdir -pv $out/lib/cups/backend
+    ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb
+  '' + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf";
 
 
   # Don't pass --with-private-dir=/var/samba/private