diff --git a/cross/alpha.conf b/cross/alpha.conf
deleted file mode 100644
index 5bde551..0000000
--- a/cross/alpha.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[General]
-include=/usr/share/multistrap/crosschroot.conf
-omitrequired=false
-configscript=
-setupscript=
-debootstrap=Debian Base Toolchains
-aptsources=Debian Toolchains
-tarballname=pdebuild-cross.tgz
-
-[Toolchains]
-packages=g++-4.4-alpha-linux-gnu linux-libc-dev-alpha-cross
-reinstall=binutils-multiarch
-source=http://www.emdebian.org/debian
-keyring=emdebian-archive-keyring
-suite=squeeze
diff --git a/cross/armel.conf b/cross/armel.conf
index 3501362..86baa8b 100644
--- a/cross/armel.conf
+++ b/cross/armel.conf
@@ -4,7 +4,7 @@ omitrequired=false
 configscript=
 setupscript=/usr/share/multistrap/setcrossarch.sh
 debootstrap=Debian Base Toolchains
-aptsources=Debian Toolchains
+aptsources=Debian Toolchains Foreign
 tarballname=pdebuild-cross.tgz
 
 [Toolchains]
@@ -13,3 +13,10 @@ reinstall=binutils-multiarch
 source=http://www.emdebian.org/debian
 keyring=emdebian-archive-keyring
 suite=squeeze
+
+[Foreign]
+packages=
+source=http://cdn.debian.net/debian
+keyring=debian-archive-keyring
+suite=unstable
+architecture=armel
diff --git a/cross/hppa.conf b/cross/hppa.conf
deleted file mode 100644
index c2fee17..0000000
--- a/cross/hppa.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[General]
-include=/usr/share/multistrap/crosschroot.conf
-omitrequired=false
-configscript=
-setupscript=
-debootstrap=Debian Base Toolchains
-aptsources=Debian Toolchains
-tarballname=pdebuild-cross.tgz
-
-[Toolchains]
-packages=g++-4.4-hppa-linux-gnu linux-libc-dev-hppa-cross
-reinstall=binutils-multiarch
-source=http://www.emdebian.org/debian
-keyring=emdebian-archive-keyring
-suite=squeeze
diff --git a/cross/mips.conf b/cross/mips.conf
index a3e4664..001d9ec 100644
--- a/cross/mips.conf
+++ b/cross/mips.conf
@@ -4,7 +4,7 @@ omitrequired=false
 configscript=
 setupscript=/usr/share/multistrap/setcrossarch.sh
 debootstrap=Debian Base Toolchains
-aptsources=Debian Toolchains
+aptsources=Debian Toolchains Foreign
 tarballname=pdebuild-cross.tgz
 
 [Toolchains]
@@ -13,3 +13,10 @@ reinstall=binutils-multiarch
 source=http://www.emdebian.org/debian
 keyring=emdebian-archive-keyring
 suite=squeeze
+
+[Foreign]
+packages=
+source=http://cdn.debian.net/debian
+keyring=debian-archive-keyring
+suite=unstable
+architecture=mips
diff --git a/cross/mipsel.conf b/cross/mipsel.conf
index c830823..7d371c6 100644
--- a/cross/mipsel.conf
+++ b/cross/mipsel.conf
@@ -4,7 +4,7 @@ omitrequired=false
 configscript=
 setupscript=/usr/share/multistrap/setcrossarch.sh
 debootstrap=Debian Base Toolchains
-aptsources=Debian Toolchains
+aptsources=Debian Toolchains Foreign
 tarballname=pdebuild-cross.tgz
 
 [Toolchains]
@@ -13,3 +13,10 @@ reinstall=binutils-multiarch
 source=http://www.emdebian.org/debian
 keyring=emdebian-archive-keyring
 suite=squeeze
+
+[Foreign]
+packages=
+source=http://cdn.debian.net/debian
+keyring=debian-archive-keyring
+suite=unstable
+architecture=mipsel
diff --git a/cross/powerpc.conf b/cross/powerpc.conf
index 4cc7e4f..c8c7f2f 100644
--- a/cross/powerpc.conf
+++ b/cross/powerpc.conf
@@ -4,7 +4,7 @@ omitrequired=false
 configscript=
 setupscript=/usr/share/multistrap/setcrossarch.sh
 debootstrap=Debian Base Toolchains
-aptsources=Debian Toolchains
+aptsources=Debian Toolchains Foreign
 tarballname=pdebuild-cross.tgz
 
 [Toolchains]
@@ -13,3 +13,10 @@ reinstall=binutils-multiarch
 source=http://www.emdebian.org/debian
 keyring=emdebian-archive-keyring
 suite=squeeze
+
+[Foreign]
+packages=
+source=http://cdn.debian.net/debian
+keyring=debian-archive-keyring
+suite=unstable
+architecture=powerpc
diff --git a/cross/s390.conf b/cross/s390.conf
index 2dfdbf1..dc24f8e 100644
--- a/cross/s390.conf
+++ b/cross/s390.conf
@@ -4,7 +4,7 @@ omitrequired=false
 configscript=
 setupscript=
 debootstrap=Debian Base Toolchains
-aptsources=Debian Toolchains
+aptsources=Debian Toolchains Foreign
 tarballname=pdebuild-cross.tgz
 
 [Toolchains]
@@ -13,3 +13,10 @@ reinstall=binutils-multiarch
 source=http://www.emdebian.org/debian
 keyring=emdebian-archive-keyring
 suite=squeeze
+
+[Foreign]
+packages=
+source=http://cdn.debian.net/debian
+keyring=debian-archive-keyring
+suite=unstable
+architecture=s390
diff --git a/cross/sparc.conf b/cross/sparc.conf
index 163611e..57f0f38 100644
--- a/cross/sparc.conf
+++ b/cross/sparc.conf
@@ -4,7 +4,7 @@ omitrequired=false
 configscript=
 setupscript=
 debootstrap=Debian Base Toolchains
-aptsources=Debian Toolchains
+aptsources=Debian Toolchains Foreign
 tarballname=pdebuild-cross.tgz
 
 [Toolchains]
@@ -13,3 +13,10 @@ reinstall=binutils-multiarch
 source=http://www.emdebian.org/debian
 keyring=emdebian-archive-keyring
 suite=squeeze
+
+[Foreign]
+packages=
+source=http://cdn.debian.net/debian
+keyring=debian-archive-keyring
+suite=unstable
+architecture=sparc
diff --git a/debian/changelog b/debian/changelog
index a645ae7..b3c8666 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+multistrap (2.1.21) unstable; urgency=low
+
+  * Add Foreign arch support to each cross-building configuration.
+    (Closes: #688628). Drop some unused configuration files.
+
+ -- Neil Williams <codehelp@debian.org>  Mon, 24 Sep 2012 13:39:56 +0100
+
 multistrap (2.1.20) unstable; urgency=low
 
   * [INTL:da] Danish translation of multistrap (Closes: #669879)