diff --git a/debian/changelog b/debian/changelog
index 5acedc43..34ed2e84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ livecd-rootfs (2.181) UNRELEASED; 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:28:15 +0100
 
diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot
index f90b4ba0..bb4c0008 100755
--- a/live-build/ubuntu-touch/hooks/60-install-click.chroot
+++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot
@@ -4,7 +4,14 @@ 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_db=/usr/share/click/preinstalled