diff --git a/debian/changelog b/debian/changelog
index cc5146cd..3cc7806f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.181) saucy; urgency=low
+
+  * Use new multiple-database scheme in click 0.4.3 to preinstall click
+    packages.
+  * Download core click packages from the right place when building images
+    outside the Canonical datacentre.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 05 Sep 2013 11:29:17 +0100
+
 livecd-rootfs (2.180) saucy; urgency=low
 
   * make sure the NM configuration mangling of touch images uses the sudo and
diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot
index bf9737ad..bb4c0008 100755
--- a/live-build/ubuntu-touch/hooks/60-install-click.chroot
+++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot
@@ -4,14 +4,28 @@ set -e
 
 echo "Setting up click packages"
 
-click_uri=http://archive-team.internal/click_packages
+case $(hostname --fqdn) in
+	*.ubuntu.com)
+		click_uri=http://archive-team.internal/click_packages
+		;;
+	*)
+		click_uri=http://people.canonical.com/~ubuntu-archive/click_packages
+		;;
+esac
 click_list=$click_uri/click_list
-click_dir=/usr/share/preinstalled/click
+click_db=/usr/share/click/preinstalled
 
-mkdir -p "$click_dir"
+mkdir -p -m 755 "$click_db"
+chown clickpkg:clickpkg "$click_db"
+
+tmpdir="$(mktemp -d)"
+cleanup () { rm -rf "$tmpdir"; }
+trap cleanup EXIT
 
 for package in $(wget -qO- "$click_list")
 do
     echo "Setting up $package"
-    wget --no-verbose -O "$click_dir"/"$package" "$click_uri"/"$package"
+    wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package"
+    click install --force-missing-framework --root="$click_db" --all-users \
+        "$tmpdir/$package"
 done