diff --git a/debian/changelog b/debian/changelog
index 960213a6..4249a9f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.131) saucy; urgency=low
+
+  * drop hardcoded packagelists for ubuntu-touch, this is dealt with by
+    the ubuntu-touch seed/task/metapackage
+  * drop android build script, we will instead use a package
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 07 May 2013 14:19:03 +0200
+
 livecd-rootfs (2.130) saucy; urgency=low
 
   * make sure we build a plain filesystem for ubuntu-touch (this should
diff --git a/live-build/ubuntu-touch/package-lists/README b/live-build/ubuntu-touch/package-lists/README
deleted file mode 100644
index 1d01f677..00000000
--- a/live-build/ubuntu-touch/package-lists/README
+++ /dev/null
@@ -1,2 +0,0 @@
-# Package lists that exist in this directory need
-# to have a .list.chroot suffix in order to be processed.
diff --git a/live-build/ubuntu-touch/package-lists/apps.list.chroot b/live-build/ubuntu-touch/package-lists/apps.list.chroot
deleted file mode 100644
index b8ff7af0..00000000
--- a/live-build/ubuntu-touch/package-lists/apps.list.chroot
+++ /dev/null
@@ -1,19 +0,0 @@
-hud
-qtubuntu
-qt5-default
-qtchooser
-qtdeclarative5-ubuntu-ui-toolkit-plugin
-webbrowser-app
-camera-app
-gallery-app
-phone-app
-mediaplayer-app
-notes-app
-libandroid-audiosystem-asound2
-demo-assets
-webapps-demo
-share-app
-ubuntu-calendar-app
-ubuntu-calculator-app
-ubuntu-clock-app
-ubuntu-weather-app
diff --git a/live-build/ubuntu-touch/package-lists/core.list.chroot b/live-build/ubuntu-touch/package-lists/core.list.chroot
deleted file mode 100644
index cc753bae..00000000
--- a/live-build/ubuntu-touch/package-lists/core.list.chroot
+++ /dev/null
@@ -1,37 +0,0 @@
-libhybris
-libhybris-test
-isc-dhcp-client
-net-tools
-network-manager
-bluez
-ca-certificates
-alsa-base
-alsa-utils
-ttf-ubuntu-font-family
-fonts-freefont-ttf
-ttf-dejavu-extra
-dbus-x11
-ubuntu-session
-chewie
-powerd
-language-pack-en
-maliit-framework
-maliit-keyboard
-maliit-keyboard-data
-friends
-friends-facebook
-friends-twitter
-telepathy-gabble
-libmessaging-menu0
-signon-plugin-oauth2
-python3-gi
-python3-pkg-resources
-python3-oauthlib
-gir1.2-accounts-1.0
-account-plugin-tools
-account-plugin-twitter
-account-plugin-facebook
-libqtfolks1
-ubuntu-mobile
-ubuntu-qtlocation-plugin
-software-properties-common
diff --git a/live-build/ubuntu-touch/package-lists/debug.list.chroot b/live-build/ubuntu-touch/package-lists/debug.list.chroot
deleted file mode 100644
index e8f126e4..00000000
--- a/live-build/ubuntu-touch/package-lists/debug.list.chroot
+++ /dev/null
@@ -1,3 +0,0 @@
-nano
-iputils-ping
-wireless-tools
diff --git a/live-build/ubuntu-touch/package-lists/shell.list.chroot b/live-build/ubuntu-touch/package-lists/shell.list.chroot
deleted file mode 100644
index 96488d54..00000000
--- a/live-build/ubuntu-touch/package-lists/shell.list.chroot
+++ /dev/null
@@ -1,10 +0,0 @@
-qml-phone-shell
-indicators-client
-indicators-client-plugin-sound
-indicators-client-plugin-network
-indicators-client-plugin-messaging
-indicators-client-plugin-power
-indicators-client-plugin-datetime
-indicators-client-examples
-unity-lens-people
-unity-lens-applications
diff --git a/ubuntu-touch-android.sh b/ubuntu-touch-android.sh
deleted file mode 100755
index 76ba937e..00000000
--- a/ubuntu-touch-android.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-set -e
-
-codename=$1
-builddir=$codename-build
-release=raring
-
-[ "$(dpkg --print-architecture)" = "amd64" ] || exit 1
-
-# set up a build chroot
-case $(hostname --fqdn) in
-	*.buildd)
-		MIRROR=http://ftpmaster.internal/ubuntu
-		;;
-	*)
-		MIRROR=http://archive.ubuntu.com/ubuntu
-		;;
-esac
-debootstrap --components=main,universe $release $builddir $MIRROR
-
-mkdir -p $builddir/dev/pts
-mount -t devpts devpts $builddir/dev/pts
-chroot $builddir mount -t proc proc /proc
-chroot $builddir mount -t sysfs sys /sys
-
-# set up multiarch inside the chroot
-chroot $builddir dpkg --add-architecture i386
-chroot $builddir apt-get update
-
-# add cross build env including the needed i386 packages
-chroot $builddir apt-get -y install git gnupg flex bison gperf build-essential \
-    zip bzr curl libc6-dev libncurses5-dev:i386 x11proto-core-dev \
-    libx11-dev:i386 libreadline6-dev:i386 libgl1-mesa-glx:i386 \
-    libgl1-mesa-dev g++-multilib mingw32 tofrodos phablet-tools \
-    python-markdown libxml2-utils xsltproc zlib1g-dev:i386 schedtool \
-	openjdk-6-jdk
-
-# create an in chroot script to get the git tree and build it
-cat << 'EOF' > $builddir/build-android.sh
-#!/bin/bash
-
-phablet-dev-bootstrap -v $codename $builddir
-cd $builddir
-repo sync
-. build/envsetup.sh
-brunch $codename
-EOF
-
-chmod +x $builddir/build-android.sh
-
-chroot $builddir /build-android.sh
-
-cp $builddir/$builddir/out/target/product/$codename/*-$codename.zip ./livecd.ubuntu-touch-$codename.zip
-for image in system recovery boot; do
-	cp $builddir/$builddir/out/target/product/$codename/$image.img ./livecd.ubuntu-touch-$codename.$image.img
-done
-
-umount -l $builddir/sys
-umount -l $builddir/proc
-umount -l $builddir/dev/pts
-
-rm -rf $builddir