diff --git a/hooks/debian/10-disable-tls b/hooks/debian/10-disable-tls
deleted file mode 100755
index 7a916fa..0000000
--- a/hooks/debian/10-disable-tls
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-#  This script disables TLS on the new image or installs a Xen-aware
-# version of libc where it is available.
-#
-# Steve
-# --
-# http://www.steve.org.uk/
-
-
-prefix=$1
-
-#
-#  Source our common functions
-#
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
-else
-    . ./hooks/common.sh
-fi
-
-
-#
-# Log our start
-#
-logMessage Script $0 starting
-
-
-
-
-#
-# For sid or etch systems we install libc6-xen
-#
-# For sarge we don't have that option, so we disable TLS.
-#
-case "${dist}" in
-    etch|sid)
-        logMessage "Installing xen-aware libc6"
-
-        installDebianPackage ${prefix} libc6-xen
-        ;;
-    *)
-        logMessage "Disabling TLS"
-        mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
-        mkdir ${prefix}/lib/tls
-        ;;
-esac
-
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished
diff --git a/hooks/debian/20-setup-apt b/hooks/debian/20-setup-apt
index 9d33c43..bba6c2d 100755
--- a/hooks/debian/20-setup-apt
+++ b/hooks/debian/20-setup-apt
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-#  This script sets up the /etc/apt/sources.list for APT.
+#  This script sets up the /etc/apt/sources.list for APT, and it disables
+# TLS where appropriate.
 #
 # Steve
 # --
@@ -88,6 +89,27 @@ E_O_APT
 chroot ${prefix} /usr/bin/apt-get update
 
 
+
+#
+# For sid or etch systems we install libc6-xen
+#
+# For sarge we don't have that option, so we disable TLS.
+#
+case "${dist}" in
+    etch|sid)
+        logMessage "Installing xen-aware libc6"
+
+        installDebianPackage ${prefix} libc6-xen
+        ;;
+    *)
+        logMessage "Disabling TLS"
+        mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
+        mkdir ${prefix}/lib/tls
+        ;;
+esac
+
+
+
 #
 #  Log our finish
 #