diff --git a/Makefile b/Makefile
index f6bbd2e..d060f5d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,25 +4,21 @@ all: install
 install:
 	install -d /usr/bin
 	cp -fa gbootroot /usr/bin/gbootroot
-	install -d /usr/lib/bootroot
+	install -d /usr/lib/bootroot	
+	mkdir -f user-mode-linux/usr/bin
+	mkdir -f root_filesystem
 	cp -fa yard_chrooted_tests /usr/lib/bootroot/yard_chrooted_tests
-	cp -fa genext2fs/genext2fs /usr/lib/bootroot/genext2fs
 	cp -fa expect_uml /usr/lib/bootroot/expect_uml
 	install -d /usr/lib/bootroot/root_filesystem
-	chmod 0666 root_filesystem/root_fs_helper
-	cp -fa root_filesystem/root_fs_helper /usr/lib/bootroot/root_filesystem
-	cp -fa root_filesystem/Initrd.gz /usr/lib/bootroot/root_filesystem
 	cp -fa yard/scripts/make_debian /usr/bin/make_debian
 	install -d /usr/share/perl5/BootRoot
 	cp -fa BootRoot/*.pm /usr/share/perl5/BootRoot
 	install -d /usr/share/gbootroot/yard/Replacements
 	cp -fa yard/replacements/* /usr/share/gbootroot/yard/Replacements
 	install -d /usr/lib/bootroot/yard/Replacements/lib/modules
-	cp -fa user-mode-linux/usr/lib/uml/modules* /usr/lib/bootroot/yard/Replacements/lib/modules
 	cp -fa user-mode-linux/usr/lib/uml/config /usr/lib/bootroot/yard/Replacements/lib/modules
 	cp -fa user-mode-linux/usr/lib/uml/CVS /usr/lib/bootroot/yard/Replacements/lib/modules/CVS
 	install -d /usr/lib/uml
-	cp -fa user-mode-linux/usr/lib/uml/port-helper /usr/lib/uml/port-helper
 	install -d /usr/share/gbootroot/yard/templates
 	chmod 0444 yard/templates/*.yard
 	cp -fa yard/templates/Example* /usr/share/gbootroot/yard/templates
@@ -32,11 +28,6 @@ install:
 	cp -fa genext2fs/genext2fs.c /usr/share/gbootroot/genext2fs
 	cp -fa genext2fs/Makefile /usr/share/gbootroot/genext2fs
 	cp -fa genext2fs/dev* /usr/share/gbootroot/genext2fs
-	cp -fa user-mode-linux/usr/bin/uml_* /usr/bin
-	chown 0:0 /usr/bin/uml_*
-	chmod 4755 /usr/bin/uml_net
-	cp -fa user-mode-linux/usr/bin/tunctl /usr/bin/tunctl
-	cp -fa user-mode-linux/usr/bin/linuxbr /usr/bin/linuxbr
 	install -d /etc/gbootroot
 	cp -fa gbootrootrc /etc/gbootroot/gbootrootrc
 	install -d /usr/X11R6/include/X11/pixmaps
diff --git a/Makefile.pkg b/Makefile.pkg
index 75e339b..ce5bd86 100644
--- a/Makefile.pkg
+++ b/Makefile.pkg
@@ -56,13 +56,15 @@ sources: $(BASE_DIR)
 		while [ ! -f $(SOURCE_DIR)/$(PATCH_1) ] ; do \
 			wget -P $(SOURCE_DIR) --passive $(PATCH_1_SITE)/$(PATCH_1); \
 		done; \
-		if [ ! -d $(KERNEL_DIR) ] ; then \
-			tar xvfj $(SOURCE_DIR)/$(KERNEL_SOURCE); \
-		fi; \
+	fi;
+	@if [ ! -d $(KERNEL_DIR) ] ; then \
+		tar xvfj $(SOURCE_DIR)/$(KERNEL_SOURCE); \
 		bzcat $(SOURCE_DIR)/$(PATCH_1) | patch -d $(KERNEL_DIR) -p1; \
 		patch -d $(KERNEL_DIR) -p1 < $(PATCH_2); \
 		perl -i -p -e "s/^ARCH :=.*/ARCH=um/g" $(KERNEL_DIR)/Makefile; \
-	fi;
+	fi; 
+
+
 
 
 kernel: 
@@ -133,6 +135,7 @@ tools:
 genext2fs: tools
 	@if [ ! -f $(GENEXT2_DIR)/genext2fs ] ; then \
 		$(MAKE) -C $(GENEXT2_DIR); \
+		strip -s $(GENEXT2_DIR)/genext2fs; \
 	fi;
 
 clean:
diff --git a/gbootroot_pkg b/gbootroot_pkg
index ab7a586..5ac9bb1 100755
--- a/gbootroot_pkg
+++ b/gbootroot_pkg
@@ -42,6 +42,15 @@ use File::Find;
 # User defined variables for directories and package
 # Makefile.pkg in $gbootroot_cvs in used as the packages Makefile.
 
+# To get this to work properly I had to make two changes to the debian system
+# In dpkg-buildpackage noclean=false was changed to noclean=true, this is
+# to avoid the initial clean which is done, but if you turn noclean off with
+# a cmdline switch only an build is done.
+#
+# In dpkg-source I added '.*bz2$| to $diff_ignore_default_regexp because the
+# -i switch seemed to ignore anything I added to it, either failing 
+# or ignoring, though recognizing the -i switch .. so this has been altered.
+
 my $user_home = "/home/mttrader";
 my $prog = "gbootroot";
 my $prog_real_name = "/BootRoot/BootRoot.pm";
@@ -163,14 +172,20 @@ chdir($gbootroot_cvs) or die "Couldn't change to $gbootroot_cvs: $!\n";
 
 foreach (@make_lines) {
 	s/\t//;
-	if (/cp/) {
+	if (/cp|mkdir/) {
 	 my $dir = ((split))[2];
 	 my $base;
          	if ($dir =~ m,/,) {
 	 	$base = dirname($dir);
 		home_builder("$packaging_place/$base");
 		}
-	 system "cp -fa $dir $packaging_place/$base";
+         if ( $_ =~ /cp/ ) {
+	       system "cp -fa $dir $packaging_place/$base";
+         }
+         else {
+	       system "install -d $packaging_place/$dir";
+         }
+
 	}
 	else {
                if (!/mknod|dev/) {
@@ -313,8 +328,9 @@ if (!$stop) {
 
 } # end if !$stop
 
-
-system "debuild";
+# dpkg-buildpackage  .. no sense dl the sources
+system "cp -fa $gbootroot_cvs/sources/*bz2 $packaging_place/sources/";
+system "debuild -rfakeroot -i\`.*bz2$\` -k2DAB7037";
 
 
 } # both or deb
diff --git a/pkg/dpkg/changelog b/pkg/dpkg/changelog
index ecaa116..5569de7 100644
--- a/pkg/dpkg/changelog
+++ b/pkg/dpkg/changelog
@@ -1,3 +1,19 @@
+gbootroot (1.4.0-1) unstable; urgency=low
+
+  * Had to add user-mode-linux/usr/lib/uml to the path to allow --home
+    to find port-helper, or otherwise root_fs complain.  Have no idea
+    why this change exists with port-helper because wasn't the case
+    before. Also, added path for user-mode-linux/usr/bin to find the
+    other tools.
+  * When root_fs_helper was running with the newer Expect.pm, and
+    consequentially the newer uml kernel it became necessary to get out
+    when the kernel shuts down with a last function right when it says
+    "Power down."
+  * Checks for the proper version for newer libc6 linkers.  Hopefully,
+    should work properly with libc6 > 2.3.1, too.
+
+ -- Jonathan Rosenbaum <freesource@users.sourceforge.net>  Wed, 18 Dec 2002 02:26:53 -0500
+
 gbootroot (1.3.6-1) unstable; urgency=low
 
   * Updated to 2.4.18-2um and the latest uml tools 20020212, including
diff --git a/pkg/dpkg/control b/pkg/dpkg/control
index a39266d..98a9feb 100644
--- a/pkg/dpkg/control
+++ b/pkg/dpkg/control
@@ -2,10 +2,10 @@ Source: gbootroot
 Section: utils
 Priority: optional
 Maintainer: Jonathan Rosenbaum <freesource@users.sourceforge.net>
-Build-Depends: debhelper (>> 3.0.0)
+Build-Depends: debhelper (>> 3.0.0), binutils, fileutils (>= 4.0), gcc | c-compiler, make, libc-dev, bin86, wget
 Standards-Version: 3.5.2
 
-Package: gbootroot
+Package: gbootroot 
 Architecture: i386 
 Depends:  ${perl:Depends}, perl-modules, libgtk-perl (>= 0.7002), libc6 (>= 2.1.2), libexpect-perl, ash, file, binutils, bzip2
 Recommends: dswim, lilo
@@ -23,3 +23,6 @@ Description: Boot/Root Filesystem Distribution testing and creation.
  .	
  deb http://prdownloads.sourceforge.net/gbootroot ./
  deb http://prdownloads.sourceforge.net/avd ./
+ .
+ See manual for instructions on how to add lines to your sources.list so that
+ apt-get may be used for both binary and source packages.
diff --git a/pkg/dpkg/rules b/pkg/dpkg/rules
index 2864518..2ba85e1 100755
--- a/pkg/dpkg/rules
+++ b/pkg/dpkg/rules
@@ -11,9 +11,8 @@ export DH_COMPAT=3
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
 	
-
+	# Add here commands to configure the package.	
 	touch configure-stamp
 
 build: configure-stamp build-stamp
@@ -33,6 +32,7 @@ clean:
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
+	-$(MAKE) clean-sources
 
 	dh_clean
 
diff --git a/pkg/rpm/gbootroot-mdk.spec b/pkg/rpm/gbootroot-mdk.spec
index 14df592..2dc19b6 100644
--- a/pkg/rpm/gbootroot-mdk.spec
+++ b/pkg/rpm/gbootroot-mdk.spec
@@ -72,8 +72,9 @@ chown -R root:root .
 %install
 make
 
-# nothing to clean
 %clean
+make clean
+make clean-sources
 
 
 # Update this as necessary
diff --git a/pkg/rpm/gbootroot.spec b/pkg/rpm/gbootroot.spec
index 5faf119..bf2487b 100644
--- a/pkg/rpm/gbootroot.spec
+++ b/pkg/rpm/gbootroot.spec
@@ -72,8 +72,9 @@ chown -R root:root .
 %install
 make
 
-# nothing to clean
 %clean
+make clean
+make clean-sources
 
 
 # Update this as necessary