diff --git a/Makefile.pkg b/Makefile.pkg
index 6903ecf..75e339b 100644
--- a/Makefile.pkg
+++ b/Makefile.pkg
@@ -2,7 +2,7 @@
 # buildroot, UML, and gbootroot.
 
 VERSION=2.4.19
-PATCH_VERSION=38
+PATCH_VERSION=40
 UTIL_VER=20021103
 
 BASE_DIR=${shell pwd}
@@ -34,18 +34,6 @@ UTILITIES=uml_utilities_$(UTIL_VER).tar.bz2
 UTIL_DIR=$(BASE_DIR)/tools
 TOOLS = $(UTIL_DIR)/mconsole $(UTIL_DIR)/port-helper $(UTIL_DIR)/moo $(UTIL_DIR)/uml_net $(UTIL_DIR)/uml_router $(UTIL_DIR)/tunctl
 
-##TARGET_CC=$(BUILD_DIR)/bin/gcc
-##TARGET_CC1=$(BUILD_DIR)/usr/bin/$(ARCH)-uclibc-gcc
-##TARGET_CROSS=$(BUILD_DIR)/usr/bin/$(ARCH)-uclibc-
-##TARGET_PATH=$(BUILD_DIR)/usr/bin:$(BUILD_DIR)/bin:/bin:/sbin:/usr/bin:/usr/sbin
-##UCLIBC_DIR=$(BASE_DIR)/uClibc
-##UCLIBC_SOURCE=uClibc-snapshot.tar.gz
-##UCLIBC_PATCH=$(SOURCE_DIR)/uClibc.patch
-##UCLIBC_SITE=ftp://oss.lineo.com
-##BUSYBOX_DIR=$(BASE_DIR)/busybox
-##BUSYBOX_SOURCE=busybox.tar.gz
-##BUSYBOX_PATCH=$(SOURCE_DIR)/busybox.patch
-##BUSYBOX_SITE=http://busybox.lineo.com
 
 all:   world
 world: sources initrd
@@ -147,6 +135,16 @@ genext2fs: tools
 		$(MAKE) -C $(GENEXT2_DIR); \
 	fi;
 
+clean:
+	rm -rf $(KERNEL_DIR)
+	rm -rf $(UTIL_DIR)
+	rm -f $(GENEXT2_DIR)/{genext2fs,genext2fs.o}	
+	rm -f $(ROOT_FS_DIR)/{root_fs_helper,Initrd.gz}
+
+clean-sources:
+	rm -f $(SOURCE_DIR)/*
+
+
 install:
 	install -d $(DESTDIR)/usr/bin
 	cp -fa gbootroot $(DESTDIR)/usr/bin/gbootroot
@@ -205,4 +203,4 @@ remove:
 	rm /usr/X11R6/include/X11/pixmaps/gbootroot.xpm
 	rm -rf /usr/share/doc/gbootroot
 
-.PHONY: tools sources genext2fs root_fs_helper_genext2fs root_fs_helper
\ No newline at end of file
+.PHONY: tools sources genext2fs root_fs_helper
\ No newline at end of file
diff --git a/gbootroot_pkg b/gbootroot_pkg
index 6aec70a..ab7a586 100755
--- a/gbootroot_pkg
+++ b/gbootroot_pkg
@@ -104,7 +104,7 @@ if (!( $ARGV[0] eq "both" || $ARGV[0] eq "deb" || $ARGV[0] eq "rpm" ||
 
 
 # Here's where we get to copy over all the pristine sources from the build
-if ( -e $packaging_place) {
+if ( -e $packaging_place && $ARGV[0] eq "cvs" ) {
 
 # sources 
 system "cp -a $packaging_place/sources/* $gbootroot_cvs/sources/";
@@ -124,6 +124,9 @@ system "cp -a $packaging_place/user-mode-linux/usr/bin/* $gbootroot_cvs/user-mod
 # genext2fs
 system "cp -a $packaging_place/genext2fs/genext2fs $gbootroot_cvs/genext2fs/genext2fs";
 
+# root_fs_helper & Initrd.gz
+system "cp -a $packaging_place/root_filesystem/root_fs_helper $gbootroot_cvs/root_filesystem/root_fs_helper";
+system "cp -a $packaging_place/root_filesystem/Initrd.gz $gbootroot_cvs/root_filesystem/Initrd.gz";
 
 exit;
 
@@ -180,7 +183,6 @@ foreach (@make_lines) {
 # Stuff not in the Makefile
 system "cp -fa $makefile $packaging_place/Makefile";
 
-
 #  Basically this is stuff we want in the source package, but not the normal
 #  package
 system "cp -fa README $packaging_place/README";
diff --git a/genext2fs/genext2fs b/genext2fs/genext2fs
index 510bb9e..8f7990d 100755
Binary files a/genext2fs/genext2fs and b/genext2fs/genext2fs differ
diff --git a/user-mode-linux/usr/bin/tunctl b/user-mode-linux/usr/bin/tunctl
index 99a272e..2be6ae3 100755
Binary files a/user-mode-linux/usr/bin/tunctl and b/user-mode-linux/usr/bin/tunctl differ
diff --git a/user-mode-linux/usr/bin/uml_mconsole b/user-mode-linux/usr/bin/uml_mconsole
index eef4b82..7295d10 100755
Binary files a/user-mode-linux/usr/bin/uml_mconsole and b/user-mode-linux/usr/bin/uml_mconsole differ
diff --git a/user-mode-linux/usr/bin/uml_moo b/user-mode-linux/usr/bin/uml_moo
index 93ba66d..87c7693 100755
Binary files a/user-mode-linux/usr/bin/uml_moo and b/user-mode-linux/usr/bin/uml_moo differ
diff --git a/user-mode-linux/usr/bin/uml_net b/user-mode-linux/usr/bin/uml_net
index 4f62079..8a5c6a2 100755
Binary files a/user-mode-linux/usr/bin/uml_net and b/user-mode-linux/usr/bin/uml_net differ
diff --git a/user-mode-linux/usr/bin/uml_switch b/user-mode-linux/usr/bin/uml_switch
index 603c9c5..8e008cb 100755
Binary files a/user-mode-linux/usr/bin/uml_switch and b/user-mode-linux/usr/bin/uml_switch differ
diff --git a/user-mode-linux/usr/lib/uml/config b/user-mode-linux/usr/lib/uml/config
index 7de510f..74f98de 100755
--- a/user-mode-linux/usr/lib/uml/config
+++ b/user-mode-linux/usr/lib/uml/config
@@ -16,7 +16,8 @@ CONFIG_EXPERIMENTAL=y
 #
 # General Setup
 #
-CONFIG_STDIO_CONSOLE=y
+CONFIG_MODE_TT=y
+CONFIG_MODE_SKAS=y
 CONFIG_NET=y
 CONFIG_SYSVIPC=y
 CONFIG_BSD_PROCESS_ACCT=y
@@ -24,18 +25,17 @@ CONFIG_SYSCTL=y
 CONFIG_BINFMT_AOUT=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
-CONFIG_SSL=y
 CONFIG_HOSTFS=y
+CONFIG_HPPFS=m
 CONFIG_MCONSOLE=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_HOST_2G_2G is not set
 # CONFIG_UML_SMP is not set
 # CONFIG_SMP is not set
-CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
-CONFIG_CON_CHAN="xterm"
-CONFIG_SSL_CHAN="pty"
+CONFIG_NEST_LEVEL=0
+CONFIG_KERNEL_HALF_GIGS=1
+CONFIG_HIGHMEM=y
+CONFIG_PROC_MM=y
 
 #
 # Loadable module support
@@ -44,7 +44,32 @@ CONFIG_MODULES=y
 CONFIG_KMOD=y
 
 #
-# Devices
+# Character Devices
+#
+CONFIG_STDIO_CONSOLE=y
+CONFIG_SSL=y
+CONFIG_FD_CHAN=y
+CONFIG_NULL_CHAN=y
+CONFIG_PORT_CHAN=y
+CONFIG_PTY_CHAN=y
+CONFIG_TTY_CHAN=y
+CONFIG_XTERM_CHAN=y
+CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
+CONFIG_CON_CHAN="xterm"
+CONFIG_SSL_CHAN="pty"
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=256
+# CONFIG_WATCHDOG is not set
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_UML_WATCHDOG is not set
+CONFIG_UML_SOUND=y
+CONFIG_SOUND=y
+CONFIG_HOSTAUDIO=y
+# CONFIG_TTY_LOG is not set
+
+#
+# Block Devices
 #
 CONFIG_BLK_DEV_UBD=y
 # CONFIG_BLK_DEV_UBD_SYNC is not set
@@ -54,14 +79,35 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_MMAPPER is not set
-CONFIG_UML_SOUND=y
-CONFIG_SOUND=y
-CONFIG_HOSTAUDIO=y
-CONFIG_FD_CHAN=y
-CONFIG_PORT_CHAN=y
-CONFIG_PTY_CHAN=y
-CONFIG_TTY_CHAN=y
-CONFIG_XTERM_CHAN=y
+CONFIG_NETDEVICES=y
+
+#
+# Network Devices
+#
+CONFIG_UML_NET=y
+CONFIG_UML_NET_ETHERTAP=y
+CONFIG_UML_NET_TUNTAP=y
+CONFIG_UML_NET_SLIP=y
+CONFIG_UML_NET_SLIRP=y
+CONFIG_UML_NET_DAEMON=y
+CONFIG_UML_NET_MCAST=y
+# CONFIG_UML_NET_PCAP is not set
+CONFIG_DUMMY=y
+CONFIG_BONDING=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=y
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_FILTER is not set
+# CONFIG_PPP_ASYNC is not set
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+CONFIG_SLIP=m
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
 # Networking options
@@ -91,6 +137,11 @@ CONFIG_INET=y
 #
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
+
+#
+# Appletalk devices
+#
+# CONFIG_DEV_APPLETALK is not set
 # CONFIG_DECNET is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_X25 is not set
@@ -108,66 +159,9 @@ CONFIG_INET=y
 # CONFIG_NET_SCHED is not set
 
 #
-# Network device support
+# Network testing
 #
-CONFIG_UML_NET=y
-CONFIG_UML_NET_ETHERTAP=y
-CONFIG_UML_NET_TUNTAP=y
-CONFIG_UML_NET_SLIP=y
-CONFIG_UML_NET_DAEMON=y
-CONFIG_UML_NET_MCAST=y
-CONFIG_NETDEVICES=y
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-CONFIG_DUMMY=y
-CONFIG_BONDING=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=y
-CONFIG_ETHERTAP=y
-
-#
-# Ethernet (10 or 100Mbit)
-#
-# CONFIG_NET_ETHERNET is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPP_ASYNC is not set
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPPOE=m
-CONFIG_SLIP=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-# CONFIG_SLIP_MODE_SLIP6 is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-# CONFIG_NET_FC is not set
-CONFIG_SHAPER=m
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
+CONFIG_NET_PKTGEN=m
 
 #
 # File systems
@@ -185,6 +179,7 @@ CONFIG_HFS_FS=m
 CONFIG_BFS_FS=m
 # CONFIG_EXT3_FS is not set
 # CONFIG_JBD is not set
+# CONFIG_JBD_DEBUG is not set
 CONFIG_FAT_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_UMSDOS_FS=y
@@ -197,13 +192,14 @@ CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_CRAMFS=y
 CONFIG_TMPFS=y
-CONFIG_RAMFS=m
+CONFIG_RAMFS=y
 CONFIG_ISO9660_FS=y
 # CONFIG_JOLIET is not set
 # CONFIG_ZISOFS is not set
 CONFIG_MINIX_FS=y
 CONFIG_VXFS_FS=m
 # CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 CONFIG_DEVFS_FS=y
@@ -226,11 +222,22 @@ CONFIG_UFS_FS=m
 # CONFIG_CODA_FS is not set
 # CONFIG_INTERMEZZO_FS is not set
 # CONFIG_NFS_FS is not set
+# CONFIG_NFS_V3 is not set
+# CONFIG_ROOT_NFS is not set
 # CONFIG_NFSD is not set
+# CONFIG_NFSD_V3 is not set
 # CONFIG_SUNRPC is not set
 # CONFIG_LOCKD is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_NCP_FS is not set
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+# CONFIG_NCPFS_NFS_NS is not set
+# CONFIG_NCPFS_OS2_NS is not set
+# CONFIG_NCPFS_SMALLDOS is not set
+# CONFIG_NCPFS_NLS is not set
+# CONFIG_NCPFS_EXTRAS is not set
 # CONFIG_ZISOFS_FS is not set
 CONFIG_ZLIB_FS_INFLATE=y
 
@@ -284,10 +291,42 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_KOI8_U is not set
 # CONFIG_NLS_UTF8 is not set
 
+#
+# SCSI support
+#
+CONFIG_SCSI=m
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_SD_EXTRA_DEVS=40
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_SR_EXTRA_DEVS=2
+CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_DEBUG_QUEUES is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_DEBUG is not set
+
 #
 # Multi-device support (RAID and LVM)
 #
 # CONFIG_MD is not set
+# CONFIG_BLK_DEV_MD is not set
+# CONFIG_MD_LINEAR is not set
+# CONFIG_MD_RAID0 is not set
+# CONFIG_MD_RAID1 is not set
+# CONFIG_MD_RAID5 is not set
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_BLK_DEV_LVM is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -295,6 +334,8 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_PARTITIONS is not set
+CONFIG_MTD_CONCAT=m
+# CONFIG_MTD_REDBOOT_PARTS is not set
 
 #
 # User Modules And Translation Layers
@@ -310,18 +351,26 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_JEDECPROBE is not set
 # CONFIG_MTD_GEN_PROBE is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+# CONFIG_MTD_CFI_AMDSTD is not set
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_OBSOLETE_CHIPS is not set
+# CONFIG_MTD_AMDSTD is not set
+# CONFIG_MTD_SHARP is not set
+# CONFIG_MTD_JEDEC is not set
 
 #
 # Mapping drivers for chip access
 #
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_PCI is not set
 
 #
 # Self-contained MTD device drivers
 #
+# CONFIG_MTD_PMC551 is not set
 CONFIG_MTD_SLRAM=m
 CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
@@ -346,3 +395,6 @@ CONFIG_MTD_BLKMTD=m
 #
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUGSYM is not set
+# CONFIG_PT_PROXY is not set
+# CONFIG_GPROF is not set
+# CONFIG_GCOV is not set
diff --git a/user-mode-linux/usr/lib/uml/port-helper b/user-mode-linux/usr/lib/uml/port-helper
index 6ff1276..ef5a492 100755
Binary files a/user-mode-linux/usr/lib/uml/port-helper and b/user-mode-linux/usr/lib/uml/port-helper differ