diff --git a/hooks/arch_filesystems b/hooks/arch_filesystems
index 8642a5dcd..50f544182 100644
--- a/hooks/arch_filesystems
+++ b/hooks/arch_filesystems
@@ -31,6 +31,16 @@ run_hook ()
     # fix ntfs-3g symlink
     ln -s /bin/ntfs-3g /sbin/mount.ntfs-3g
 
+    # fix nfs
+    ln -s /sbin/mount.nfs /sbin/mount.nfs4
+    ln -s /sbin/mount.nfs /sbin/umount.nfs
+    ln -s /sbin/mount.nfs /sbin/umount.nfs4
+
+    # fix cifs
+    ln -s /sbin/mount.cifs /sbin/mount.smbfs
+    ln -s /sbin/umount.cifs /sbin/umount.smbfs
+
+
     #needed for switching
     if ! [ "${root}" = "" ]; then
     msg -n ":: Loading root filesystem module..."
diff --git a/install/arch_filesystems b/install/arch_filesystems
index b3234b2b5..7bcb0f7a0 100644
--- a/install/arch_filesystems
+++ b/install/arch_filesystems
@@ -3,7 +3,7 @@
 install ()
 {
     MODULES=" $(checked_modules '/kernel/fs') "
-    BINARIES="mkswap debugfs.reiserfs mkfs.reiserfs reiserfsck tunefs.reiserfs resizefs.reiserfs badblocks blkid debugfs dumpe2fs e2fsck e2image findfs fsck logsave mkfs.ext2 resize2fs mkntfs ntfsmount ntfscp ntfsclone ntfslabel ntfsresize ntfsundelete ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune mkfs.xfs fsck.xfs xfs_repair xfs_admin xfs_bmap xfs_check xfs_copy xfs_db xfs_freeze xfs_growfs xfs_info xfs_io xfs_logprint xfs_mdrestore xfs_metadump xfs_mkfile xfs_ncheck xfs_quota xfs_rtcp mkdosfs dosfsck ntfs-3g"
+    BINARIES="mkswap debugfs.reiserfs mkfs.reiserfs reiserfsck tunefs.reiserfs resizefs.reiserfs badblocks blkid debugfs dumpe2fs e2fsck e2image findfs fsck logsave mkfs.ext2 resize2fs mkntfs ntfsmount ntfscp ntfsclone ntfslabel ntfsresize ntfsundelete ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune mkfs.xfs fsck.xfs xfs_repair xfs_admin xfs_bmap xfs_check xfs_copy xfs_db xfs_freeze xfs_growfs xfs_info xfs_io xfs_logprint xfs_mdrestore xfs_metadump xfs_mkfile xfs_ncheck xfs_quota xfs_rtcp mkdosfs dosfsck ntfs-3g mount.nfs mount.cifs umount.cifs"
     FILES=""
     SCRIPT="arch_filesystems"
 }
diff --git a/install/arch_pacman b/install/arch_pacman
index f2e55f9ae..e604bd632 100644
--- a/install/arch_pacman
+++ b/install/arch_pacman
@@ -18,7 +18,7 @@ rp-pppoe lilo grub iptables capi4k-utils ntfs-3g isdn4k-utils pciutils usbutils
 wpa_supplicant gzip rsync libarchive libdownload device-mapper cracklib nfs-utils nfsidmap readline acl attr \
 pcre cpio archboot fuse klibc libusb vi lzo2 libsasl libldap libevent gpm sdparm pptpclient licenses \
 madwifi madwifi-utils rt2x00-rt61-fw rt2x00-rt71w-fw rt2x00-cvs ndiswrapper ndiswrapper-utils \
-zd1211-firmware wlan-ng26-utils wlan-ng26 ipw2100-fw ipw2200-fw iwlwifi iwlwifi-3945-ucode iwlwifi-4965-ucode"
+zd1211-firmware wlan-ng26-utils wlan-ng26 ipw2100-fw ipw2200-fw iwlwifi iwlwifi-3945-ucode iwlwifi-4965-ucode smbclient"
 
 for i in $DEPENDS; do
 	for k in  $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do