diff --git a/debian/changelog b/debian/changelog
index 209e55d9..3bdc5785 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ livecd-rootfs (0.28) UNRELEASED; urgency=low
 
   * Welcome to Edgy... Switch the default i386 kernel to -686, yay!
   * And when I say "edgy", I really mean it (ie: change the suite too)
+  * Add the use of a sortfile from Tollef to the squashfs invocation.
 
  -- Adam Conrad <adconrad@ubuntu.com>  Fri,  9 Jun 2006 23:13:11 +1000
 
diff --git a/livecd.sh b/livecd.sh
index f9444371..a66cf021 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -356,7 +356,15 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
 
   livefs_squash()
   {
-    mksquashfs ${ROOT} livecd.${FS}.squashfs
+    $squashsort="http://people.ubuntu.com/~tfheen/livesort/${FS}.list.${ARCH}"
+    if wget -O livecd.${FS}.sort ${squashsort} > /dev/null 2>&1; then
+      echo "Using the squashfs sort list from ${squashsort}."
+    else
+      echo "Unable to fetch squashfs sort list; using a blank list."
+      : > livecd.${FS}.sort
+    fi
+
+    mksquashfs -sort livecd.${FS}.sort ${ROOT} livecd.${FS}.squashfs
     chmod 644 livecd.${FS}.squashfs
   }