diff --git a/livecd.sh b/livecd.sh
index 5ebd2855..3b2e25bf 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -196,9 +196,9 @@ esac; done;
 shift $((OPTIND-1))
 
 if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
-    set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base
+    set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base headless
     if [ "$ARCH" = "i386" ]; then
-        set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base
+        set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base headless
     fi
 fi
 
@@ -210,7 +210,7 @@ fi
 
 for arg in "$@"; do
     case "$arg" in
-       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-mobile|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|tocd)
+       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-mobile|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|headless|tocd)
 	    ;;
 	*)
 	    echo bad name >&2;
@@ -311,6 +311,10 @@ Flags: seen
 	    LIST="$LIST minimal^ standard^"
 	    LIVELIST="$LIVE_BOOT_SCRIPTS"
 	    ;;
+	headless)
+	    LIST="$LIST minimal^ standard^"
+	    LIVELIST="$LIVE_BOOT_SCRIPTS"
+	    ;;
 	tocd)
 	    LIST="$LIST minimal^ standard^"
 	    tocdtmp=`mktemp -d` || exit 1