diff --git a/Makefile b/Makefile
index a1cd6b2..a83c3eb 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@
 #
 #  Only used to build distribution tarballs.
 #
+TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
 VERSION     = 4.1
 BASE        = xen-tools
@@ -56,7 +57,7 @@ clean:
 	@find . -name '*.tmp' -exec rm \{\} \;
 	@find . -name 'tags' -exec rm \{\} \;
 	@find . -name '*.8.gz' -exec rm \{\} \;
-	@find man -name '*.html' -exec rm \{\} \;
+        @if [ -d man ]; then rm -rf man ; fi
 	@if [ -e build-stamp ]; then rm -f build-stamp ; fi
 	@if [ -e configure-stamp ]; then rm -f configure-stamp ; fi
 	@if [ -d debian/xen-tools ]; then rm -rf ./debian/xen-tools; fi
@@ -195,6 +196,7 @@ install: fixup-perms install-bin install-etc install-hooks install-libraries ins
 #  Build our manpages via the `pod2man` command.
 #
 manpages:
+	mkdir man
 	cd bin; for i in *-*; do pod2man --release=${VERSION} --official --section=8 $$i ../man/$$i.8; done
 	for i in man/*.8; do gzip --force -9 $$i; done
 
diff --git a/bin/xen-create-image b/bin/xen-create-image
index b005e03..469168e 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -663,7 +663,7 @@ my $FAIL = 0;
 #
 # Release number.
 #
-my $RELEASE = '4.0';
+my $RELEASE = '4.1';
 
 
 
diff --git a/bin/xen-create-nfs b/bin/xen-create-nfs
index 9755b9b..3c859d1 100755
--- a/bin/xen-create-nfs
+++ b/bin/xen-create-nfs
@@ -130,7 +130,7 @@ $CONFIG{'template'} = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.0';
+my $RELEASE = '4.1';
 
 
 # store version number away.
diff --git a/bin/xen-delete-image b/bin/xen-delete-image
index 3955c88..8edeb51 100755
--- a/bin/xen-delete-image
+++ b/bin/xen-delete-image
@@ -169,7 +169,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.0';
+my $RELEASE = '4.1';
 
 
 
diff --git a/bin/xen-list-images b/bin/xen-list-images
index c27c78c..1f3d765 100755
--- a/bin/xen-list-images
+++ b/bin/xen-list-images
@@ -102,7 +102,7 @@ $CONFIG{'prefix'} = "/etc/xen";
 #
 # Release number.
 #
-my $RELEASE = '4.0';
+my $RELEASE = '4.1';
 
 
 
diff --git a/bin/xen-resize-guest b/bin/xen-resize-guest
index 0964165..5237263 100755
--- a/bin/xen-resize-guest
+++ b/bin/xen-resize-guest
@@ -116,7 +116,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.0';
+my $RELEASE = '4.1';
 
 
 
diff --git a/bin/xen-update-image b/bin/xen-update-image
index d28a047..ecdcfe2 100755
--- a/bin/xen-update-image
+++ b/bin/xen-update-image
@@ -120,7 +120,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.0';
+my $RELEASE = '4.1';
 
 
 #
diff --git a/bin/xt-create-xen-config b/bin/xt-create-xen-config
index cc58f09..267ba17 100755
--- a/bin/xt-create-xen-config
+++ b/bin/xt-create-xen-config
@@ -156,7 +156,7 @@ $CONFIG{'template'} = '/etc/xen-tools/xm.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.0';
+my $RELEASE = '4.1';
 
 
 
diff --git a/bin/xt-customize-image b/bin/xt-customize-image
index cc94f9c..a7ac3e5 100755
--- a/bin/xt-customize-image
+++ b/bin/xt-customize-image
@@ -97,7 +97,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.0';
+my $RELEASE = '4.1';
 
 
 
diff --git a/bin/xt-install-image b/bin/xt-install-image
index 0bee3da..23befeb 100755
--- a/bin/xt-install-image
+++ b/bin/xt-install-image
@@ -113,7 +113,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.0';
+my $RELEASE = '4.1';
 
 
 #
diff --git a/hooks/edgy/20-setup-apt b/hooks/edgy/20-setup-apt
index b10e209..557e914 100755
--- a/hooks/edgy/20-setup-apt
+++ b/hooks/edgy/20-setup-apt
@@ -41,7 +41,8 @@ cp /etc/resolv.conf ${prefix}/etc
 #
 #  Process any of the present apt-conf setup lines.
 #
-for i in /etc/apt/apt.conf /etc/apt/apt.conf.d/* ; do 
+for i in /etc/apt/apt.conf $(run-parts --list /etc/apt/apt.conf.d) ; do
+
 
     #
     # If the file exists.  (Need this in case the literal glob fails.)
@@ -52,7 +53,8 @@ for i in /etc/apt/apt.conf /etc/apt/apt.conf.d/* ; do
         # Save the matching line(s) to the proxy guess file.
         #
         logMessage The use of a proxy detected.
-        grep -i HTTP::Proxy $i >> ${prefix}/etc/apt/apt.conf.d/proxy-guess
+
+        grep -v '^//' $i | grep -i HTTP::Proxy >>${prefix}/etc/apt/apt.conf.d/proxy-guess
     fi
 done
 
diff --git a/hooks/edgy/30-disable-gettys b/hooks/edgy/30-disable-gettys
index 90ce49e..93a5af7 100755
--- a/hooks/edgy/30-disable-gettys
+++ b/hooks/edgy/30-disable-gettys
@@ -42,7 +42,10 @@ if [ ! -z "${serial_device}" ]; then
 
     # replace existing device.
     mv ${prefix}/etc/event.d/tty1  ${prefix}/etc/event.d/${serial_device}
-    sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/inittab
+    sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/event.d/${serial_device}
+    [ -f ${prefix}/etc/inittab ] && sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/inittab
+
+
 
     # make sure that it is allowed to login.
     echo $serial_device >> ${prefix}/etc/securetty