diff --git a/debian/changelog b/debian/changelog
index 4a570d37..9a502d2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.10) oneiric; urgency=low
+
+  * Initial Wubi support.
+
+ -- Evan Dandrea <ev@ubuntu.com>  Mon, 04 Jul 2011 10:54:07 +0100
+
 livecd-rootfs (2.9) oneiric; urgency=low
 
   * Rename the ARM headless image to ubuntu-server for oneiric
diff --git a/live-build/auto/config b/live-build/auto/config
index 447ceb8a..ba43dc31 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -47,11 +47,19 @@ add_package ()
 OPTS=
 COMPONENTS=
 BINARY_REMOVE_LINUX=:
+LIVE_TASK=
 
 case $IMAGEFORMAT in
 	ext2|ext3|ext4)
 		OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
-		add_package live jasper
+		case $SUBPROJECT in
+			wubi)
+				add_package install lupin-support
+				;;
+			*)
+				add_package live jasper
+				;;
+		esac
 		;;
 
 	*)
@@ -62,47 +70,47 @@ esac
 case $PROJECT in
 	ubuntu|ubuntu-dvd)
 		add_task install minimal standard ubuntu-desktop
-		add_task live ubuntu-live
+		LIVE_TASK='ubuntu-live'
 		;;
 
 	kubuntu|kubuntu-dvd)
 		add_task install minimal standard kubuntu-desktop
-		add_task live kubuntu-live
+		LIVE_TASK='kubuntu-live'
 		;;
 
 	kubuntu-mobile)
 		add_task install minimal standard kubuntu-mobile
-		add_task live kubuntu-mobile-live
+		LIVE_TASK='kubuntu-mobile-live'
 		COMPONENTS='main restricted universe'
 		;;
 
 	edubuntu|edubuntu-dvd)
 		add_task install minimal standard edubuntu-desktop-gnome
-		add_task live edubuntu-live
+		LIVE_TASK='edubuntu-live'
 		COMPONENTS='main restricted universe'
 		;;
 
 	xubuntu)
 		add_task install minimal standard xubuntu-desktop
 		add_package install xterm
-		add_task live xubuntu-live
+		LIVE_TASK='xubuntu-live'
 		COMPONENTS='main restricted universe multiverse'
 		;;
 
 	ubuntu-netbook)
 		add_task install minimal standard ubuntu-netbook
-		add_task live netbook-live
+		LIVE_TASK='netbook-live'
 		;;
 
 	mythbuntu)
 		add_task install minimal standard mythbuntu-desktop
-		add_task live mythbuntu-live
+		LIVE_TASK='mythbuntu-live'
 		COMPONENTS='main restricted universe multiverse'
 		;;
 
 	lubuntu)
 		add_task install minimal standard lubuntu-desktop
-		add_task live lubuntu-live
+		LIVE_TASK='lubuntu-live'
 		COMPONENTS='main restricted universe multiverse'
 		;;
 
@@ -119,6 +127,15 @@ case $PROJECT in
 		exit 2
 		;;
 esac
+
+case $SUBPROJECT in
+	wubi)
+		;;
+	*)
+		add_task live "$LIVE_TASK"
+		;;
+esac
+
 case $PROJECT in
 	*-dvd)
 		add_task live "$PROJECT-live"
@@ -176,6 +193,12 @@ case $PROJECT in
 		;;
 esac
 
+case $SUBPROJECT in
+	wubi)
+		ln -s /usr/share/live/build/examples/hooks/ubuntu_binary_build-wubildr.sh config/binary_local-hooks/
+		;;
+esac
+
 case $PROJECT in
 	*-dvd)
 		. config/bootstrap