diff --git a/BuildLiveCD b/BuildLiveCD
index ed930b94..4ef9048b 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -72,9 +72,9 @@ if [ "$new_suite" = "yes" ] && [ "$old_suite" = "yes" ]; then
     exit 1
 fi
 if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
-    set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu mythbuntu base
+    set -- ubuntu kubuntu kubuntu-netbook edubuntu xubuntu mythbuntu base
     if [ "$ARCH" = "i386" ]; then
-        set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook-remix kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu mythbuntu base
+        set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook-remix kubuntu kubuntu-dvd kubuntu-netbook edubuntu edubuntu-dvd xubuntu mythbuntu base
     fi
 fi
 
@@ -85,7 +85,7 @@ esac
 
 for arg in "$@"; do
     case "$arg" in
-	*ubuntu|*ubuntu-dvd|kubuntu-kde4|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook-remix|mythbuntu|base|tocd)	;;
+	*ubuntu|*ubuntu-dvd|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook-remix|mythbuntu|base|tocd)	;;
 	*)
 	    echo "bad project: $arg" >&2
 	    exit 2
diff --git a/debian/changelog b/debian/changelog
index 4c69384b..62577cf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+livecd-rootfs (0.86) karmic; urgency=low
+
+  [ Scott Kitterman ]
+  * BuildLiveCD: Add kubuntu-netbook, drop kubuntu-kde4
+  * livecd.sh: Support kubuntu-netbook, drop kubuntu-kde4
+
+  [ Steve Kowalik ]
+  * livecd.sh: Switch UNR to using ubuntu-netbook-remix^ and unr-live^. 
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Tue, 30 Jun 2009 12:13:08 +1000
+
 livecd-rootfs (0.85) karmic; urgency=low
 
   * Compress the initrd with LZMA by default, now that the kernel supports
diff --git a/livecd.sh b/livecd.sh
index dfe517ee..7eeb8f43 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -134,15 +134,15 @@ esac; done;
 shift $((OPTIND-1))
 
 if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
-    set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu mythbuntu gobuntu base
+    set -- ubuntu kubuntu kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base
     if [ "$ARCH" = "i386" ]; then
-        set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base
+        set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base
     fi
 fi
 
 for arg in "$@"; do
     case "$arg" in
-       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook-remix|base|tocd)
+       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook-remix|base|tocd)
 	    ;;
 	*)
 	    echo bad name >&2;
@@ -181,10 +181,9 @@ Flags: seen
 	    LIST="$LIST minimal^ standard^ kubuntu-desktop^"
 	    LIVELIST="kubuntu-live^ laptop-detect casper lupin-casper"
 	    ;;
-	kubuntu-kde4)
-	    LIST="$LIST minimal^ standard^ kubuntu-kde4-desktop^"
-	    LIVELIST="language-support-en kubuntu-kde4-live^ laptop-detect casper lupin-casper"
-	    COMP="main restricted universe multiverse"
+	kubuntu-netbook)
+	    LIST="$LIST minimal^ standard^ kubuntu-netbook^"
+	    LIVELIST="language-support-en kubuntu-netbook-live^ laptop-detect casper lupin-casper"
 	    ;;
 	edubuntu|edubuntu-dvd)
 	    LIST="$LIST minimal^ standard^ edubuntu-desktop^"
@@ -206,8 +205,8 @@ Flags: seen
 	    COMP="main restricted universe multiverse"
 	    ;;
 	ubuntu-netbook-remix)
-	    LIST="$LIST minimal^ standard^ mobile-netbook-remix^"
-	    LIVELIST="mobile-live^ casper ubiquity"
+	    LIST="$LIST minimal^ standard^ ubuntu-netbook-remix^"
+	    LIVELIST="unr-live^ casper ubiquity"
 	    COMP="main restricted universe"
 	    ;;
 	mythbuntu)