diff --git a/package/target-finish/1st-stage/1st-stage.conf b/package/target-finish/1st-stage/1st-stage.conf
index 590b0ea71..873a82972 100644
--- a/package/target-finish/1st-stage/1st-stage.conf
+++ b/package/target-finish/1st-stage/1st-stage.conf
@@ -28,12 +28,13 @@ block_size=""
 
 initrd_img="${disksdir}/$initrd_config.img"
 
-
-kernel="$( grep "[ =]$ROCKCFG_PKG_LINUX_DEFAULT " $base/config/$config/packages | cut -f6 -d" " )-rock"
+kernel="$( readlink -e ${rootdir}/boot/System.map | sed -e "s,.*System.map-,," )"
 
 echo "Creating initrd data:"
 rm -rf ${targetdir}
 mkdir -p ${targetdir}/{dev,proc,sys,tmp,scsi,net,bin,sbin,etc,$multilib}
+# rpc.statd requires an existing /var/run directory
+mkdir -p ${targetdir}/var/run
 cd ${targetdir}
 
 # this copies a set of programs and the necessary libraries into a
diff --git a/package/target-finish/1st-stage/initrd/initrd_network b/package/target-finish/1st-stage/initrd/initrd_network
new file mode 100644
index 000000000..176f7a624
--- /dev/null
+++ b/package/target-finish/1st-stage/initrd/initrd_network
@@ -0,0 +1,2 @@
+/usr/sbin/portmap /usr/sbin/portmap
+/bin/ping /bin/ping
diff --git a/package/target-finish/1st-stage/initrd/initrd_nfs b/package/target-finish/1st-stage/initrd/initrd_nfs
new file mode 100644
index 000000000..7b22f074a
--- /dev/null
+++ b/package/target-finish/1st-stage/initrd/initrd_nfs
@@ -0,0 +1,5 @@
+/sbin/mount.nfs /sbin/mount.nfs
+/sbin/umount.nfs /sbin/umount.nfs
+/usr/sbin/rpc.statd /usr/sbin/rpc.statd
+/usr/sbin/sm-notify /usr/sbin/sm-notify
+/var/lib/nfs /var/lib/nfs
diff --git a/package/target-finish/2nd-stage/2nd-stage.conf b/package/target-finish/2nd-stage/2nd-stage.conf
index 36ed13626..fa41cce9b 100644
--- a/package/target-finish/2nd-stage/2nd-stage.conf
+++ b/package/target-finish/2nd-stage/2nd-stage.conf
@@ -35,7 +35,7 @@ package_map="       +00-dirtree
 +sysfiles           +libpcap            +iptables           +tcp_wrappers
 -kiss               +kbd		-syslinux           +ntfsprogs
 -ethtool	    -uml_utilities	+ddrescue           +libelf
-+installer          +cryptsetup_luks    +smartmontools"
++installer          +cryptsetup_luks    +smartmontools      +nfs-utils"
 
 package_map="	+$ROCKCFG_PKG_GLIBC_BRANCH	+$ROCKCFG_PKG_BASH_DEFAULT \
 		+$ROCKCFG_PKG_LINUX_DEFAULT	$package_map"
@@ -131,7 +131,10 @@ rm -rf home usr/{local,doc,man,info,games,share}
 rm -rf var/{adm,games,mail,opt}
 rm -rf usr/{include,src,*-linux-gnu} {,usr/}lib/*.{a,la,o}
 # save a few MB by removing unneeded modules
-rm -rf lib/modules/*/kernel/{drivers/media,sound}
+kernelversion="$( readlink -e $root/boot/System.map | sed -e "s,.*System.map-,," )"
+rm -rf lib/modules/$kernelversion/kernel/{drivers/media,sound}
+depmod -b . -F $root/boot/System.map $kernelversion
+
 for x in usr/lib/*/ ; do rm -rf ${x%/} ; done
 #
 if [ "$arch" = arm ] ; then