diff --git a/live-build/auto/config b/live-build/auto/config
index bd5eaca1..474aa641 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -547,8 +547,8 @@ EOF
 		fi
 		;;
 
-	ubuntu-touch)
-		cp -af /usr/share/livecd-rootfs/live-build/ubuntu-touch/* \
+	ubuntu-touch|ubuntu-core)
+		cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
 			config/
 		;;
 esac
diff --git a/live-build/ubuntu-core/hooks/01-setup_user.chroot b/live-build/ubuntu-core/hooks/01-setup_user.chroot
new file mode 100755
index 00000000..a8689e3b
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/01-setup_user.chroot
@@ -0,0 +1,12 @@
+#!/bin/sh -x
+
+USER=ubuntu
+UGID=1000
+
+echo "I: creating default user $USER"
+adduser --gecos $USER --disabled-login $USER --uid $UGID
+
+echo "I: set user $USER password to $USER"
+echo "$USER:$USER" | chpasswd
+
+chown -R $UGID:$UGID /home/$USER
diff --git a/live-build/ubuntu-core/hooks/99-remove-documentation.chroot b/live-build/ubuntu-core/hooks/99-remove-documentation.chroot
new file mode 100755
index 00000000..593d8a87
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/99-remove-documentation.chroot
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# remove-documentation: Remove unnecessary documentation to reduce disk usage
+#
+# Author: Alex Chiang <achiang@canonical.com>
+# Date  : November 9, 2010
+
+echo "Removing documentation..."
+find /usr/share/doc -depth -type f ! -name copyright|xargs rm || true
+find /usr/share/doc -empty|xargs rmdir || true
+rm -rf /usr/share/man /usr/share/groff /usr/share/info /usr/share/lintian /usr/share/linda /var/cache/man