diff --git a/samba/.footprint b/samba/.footprint
index d02c96d4c..4142c28f1 100644
--- a/samba/.footprint
+++ b/samba/.footprint
@@ -78,6 +78,7 @@ lrwxrwxrwx	root/root	usr/lib/samba/libwbclient.so -> libwbclient.so.0
 -rw-r--r--	root/root	usr/lib/samba/lowcase.dat
 drwxr-xr-x	root/root	usr/lib/samba/nss_info/
 drwxr-xr-x	root/root	usr/lib/samba/pdb/
+drwxr-xr-x	root/root	usr/lib/samba/perfcount/
 drwxr-xr-x	root/root	usr/lib/samba/rpc/
 -rw-r--r--	root/root	usr/lib/samba/upcase.dat
 -rw-r--r--	root/root	usr/lib/samba/valid.dat
@@ -141,6 +142,7 @@ drwxr-xr-x	root/root	usr/man/man7/
 -rw-r--r--	root/root	usr/man/man7/samba.7.gz
 -rw-r--r--	root/root	usr/man/man7/winbind_krb5_locator.7.gz
 drwxr-xr-x	root/root	usr/man/man8/
+-rw-r--r--	root/root	usr/man/man8/cifs.upcall.8.gz
 -rw-r--r--	root/root	usr/man/man8/eventlogadm.8.gz
 -rw-r--r--	root/root	usr/man/man8/idmap_ad.8.gz
 -rw-r--r--	root/root	usr/man/man8/idmap_adex.8.gz
diff --git a/samba/.md5sum b/samba/.md5sum
index 903974d4d..e271f9a6d 100644
--- a/samba/.md5sum
+++ b/samba/.md5sum
@@ -1,3 +1,3 @@
 448caca4745aef1a842f4fdb1aa62e1e  samba
-8fa0e3c5daaba4c2ce2fb871a5f3157a  samba-3.3.5.tar.gz
+a7137736379daf9855814ae14c2c5e22  samba-3.4.0.tar.gz
 fbaccda19afc8f75f6f0123cab82c87e  samba-config.patch
diff --git a/samba/Pkgfile b/samba/Pkgfile
index 2f6ec8953..f1b2bd2a1 100644
--- a/samba/Pkgfile
+++ b/samba/Pkgfile
@@ -4,13 +4,13 @@
 # Depends on:  ncurses openssl readline zlib
 
 name=samba
-version=3.3.5
+version=3.4.0
 release=1
 source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
         samba-config.patch samba)
 
 build () {
-    cd $name-$version/source
+    cd $name-$version/source3
 
     patch -d .. -p1 -i $SRC/samba-config.patch
 
@@ -38,7 +38,7 @@ build () {
 
     # nsswitch extensions
     install -d $PKG/lib
-    install nsswitch/libnss_win{s,bind}.so $PKG/lib
+    install ../nsswitch/libnss_win{s,bind}.so $PKG/lib
     ln -s libnss_wins.so $PKG/lib/libnss_wins.so.2
     ln -s libnss_winbind.so $PKG/lib/libnss_winbind.so.2