diff --git a/Makefile b/Makefile
index 2f1feb5..007aae5 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 # --
 # http://www.steve.org.uk/
 #
-# $Id: Makefile,v 1.87 2006-12-02 15:30:12 steve Exp $
+# $Id: Makefile,v 1.88 2006-12-03 12:16:44 radu Exp $
 
 
 #
@@ -138,10 +138,10 @@ install-hooks:
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora.d stentz.d
 	mkdir -p ${prefix}/usr/lib/xen-tools/gentoo.d/
 	cp -R hooks/gentoo/*-* ${prefix}/usr/lib/xen-tools/gentoo.d
-      mkdir -p ${prefix}/usr/lib/xen-tools/edgy.d/
-      cp -R hooks/edgy/*-* ${prefix}/usr/lib/xen-tools/edgy.d/
-      mkdir -p ${prefix}/usr/lib/xen-tools/dapper.d/
-      cp -R hooks/dapper/*-* ${prefix}/usr/lib/xen-tools/dapper.d/
+	 mkdir -p ${prefix}/usr/lib/xen-tools/edgy.d/
+	cp -R hooks/edgy/*-* ${prefix}/usr/lib/xen-tools/edgy.d/
+	mkdir -p ${prefix}/usr/lib/xen-tools/dapper.d/
+	cp -R hooks/dapper/*-* ${prefix}/usr/lib/xen-tools/dapper.d/
 	mkdir -p ${prefix}/usr/lib/xen-tools/edgy.d/
 	cp -R hooks/edgy/*-* ${prefix}/usr/lib/xen-tools/edgy.d/
 	mkdir -p ${prefix}/usr/lib/xen-tools/dapper.d/
diff --git a/bin/xt-create-xen-config b/bin/xt-create-xen-config
index 121fe38..f6a76de 100755
--- a/bin/xt-create-xen-config
+++ b/bin/xt-create-xen-config
@@ -96,7 +96,7 @@ xt-create-config - Create a Xen configuration file for a new guest
  --
  http://www.steve.org.uk/
 
- $Id: xt-create-xen-config,v 1.26 2006-12-01 12:57:55 steve Exp $
+ $Id: xt-create-xen-config,v 1.27 2006-12-03 12:16:44 radu Exp $
 
 =cut
 
@@ -203,7 +203,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-        my $REVISION      = '$Revision: 1.26 $';
+        my $REVISION      = '$Revision: 1.27 $';
         if ( $REVISION =~ /1.([0-9.]+) / )
         {
             $REVISION = $1;
@@ -304,7 +304,7 @@ sub createXenConfig
     #
     #  The memory size:  Convert Gb -> Mb.
     #
-    if ( $EMV{'memory'} =~ /^(\d+)Gb*$/i )
+    if ( $ENV{'memory'} =~ /^(\d+)Gb*$/i )
     {
         $ENV{'memory'} = $1 * 1024;
     }
diff --git a/tests/hook-inittab.t b/tests/hook-inittab.t
index c8e4728..1cf759d 100644
--- a/tests/hook-inittab.t
+++ b/tests/hook-inittab.t
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# $Id: hook-inittab.t,v 1.8 2006-11-29 11:57:47 steve Exp $
+# $Id: hook-inittab.t,v 1.9 2006-12-03 12:16:45 radu Exp $
 #
 
 use strict;
@@ -34,7 +34,7 @@ foreach my $dir ( glob( "hooks/*" ) )
     {
         my $dist = $1;
 
-        next if ( $dist =~ /(edgy|dapper)/i );
+        next if ( $dist =~ /(edgy|dapper|ubuntu)/i );
 
         testHook( $dist );
     }
diff --git a/tests/hook-tls.t b/tests/hook-tls.t
index 865f42e..9cdf755 100644
--- a/tests/hook-tls.t
+++ b/tests/hook-tls.t
@@ -4,7 +4,7 @@
 #
 # Steve
 # --
-# $Id: hook-tls.t,v 1.7 2006-11-29 18:01:55 steve Exp $
+# $Id: hook-tls.t,v 1.8 2006-12-03 12:16:45 radu Exp $
 #
 
 use strict;
@@ -28,7 +28,7 @@ foreach my $dir ( glob( "hooks/*" ) )
     {
         my $dist = $1;
 
-        testTLSDisabling( $dist ) unless ( $dist =~ /(dapper|edgy|debian)/i );
+        testTLSDisabling( $dist ) unless ( $dist =~ /(dapper|edgy|ubuntu|debian)/i );
     }
 }