diff --git a/cross/alpha.conf b/cross/alpha.conf
new file mode 100644
index 0000000..eb6ffe3
--- /dev/null
+++ b/cross/alpha.conf
@@ -0,0 +1,11 @@
+[General]
+include=/usr/share/multistrap/crosschroot.conf
+omitrequired=false
+configscript=config.sh
+setupscript=setup.sh
+
+[Toolchains]
+packages=g++-4.2-alpha-linux-gnu linux-libc-dev-alpha-cross
+source=http://www.emdebian.org/debian
+keyring=emdebian-archive-keyring
+suite=stable
diff --git a/cross/arm.conf b/cross/arm.conf
new file mode 100644
index 0000000..21de52a
--- /dev/null
+++ b/cross/arm.conf
@@ -0,0 +1,11 @@
+[General]
+include=/usr/share/multistrap/crosschroot.conf
+omitrequired=false
+configscript=config.sh
+setupscript=setup.sh
+
+[Toolchains]
+packages=g++-4.2-arm-linux-gnu linux-libc-dev-arm-cross
+source=http://www.emdebian.org/debian
+keyring=emdebian-archive-keyring
+suite=stable
diff --git a/cross/hppa.conf b/cross/hppa.conf
new file mode 100644
index 0000000..73369d2
--- /dev/null
+++ b/cross/hppa.conf
@@ -0,0 +1,11 @@
+[General]
+include=/usr/share/multistrap/crosschroot.conf
+omitrequired=false
+configscript=config.sh
+setupscript=setup.sh
+
+[Toolchains]
+packages=g++-4.2-hppa-linux-gnu linux-libc-dev-hppa-cross
+source=http://www.emdebian.org/debian
+keyring=emdebian-archive-keyring
+suite=stable
diff --git a/cross/ia64.conf b/cross/ia64.conf
new file mode 100644
index 0000000..ce2c256
--- /dev/null
+++ b/cross/ia64.conf
@@ -0,0 +1,11 @@
+[General]
+include=/usr/share/multistrap/crosschroot.conf
+omitrequired=false
+configscript=config.sh
+setupscript=setup.sh
+
+[Toolchains]
+packages=g++-4.2-ia64-linux-gnu linux-libc-dev-ia64-cross
+source=http://www.emdebian.org/debian
+keyring=emdebian-archive-keyring
+suite=stable
diff --git a/cross/s390.conf b/cross/s390.conf
new file mode 100644
index 0000000..d0c4c2e
--- /dev/null
+++ b/cross/s390.conf
@@ -0,0 +1,11 @@
+[General]
+include=/usr/share/multistrap/crosschroot.conf
+omitrequired=false
+configscript=config.sh
+setupscript=setup.sh
+
+[Toolchains]
+packages=g++-4.2-arm-linux-gnueabi linux-libc-dev-armel-cross
+source=http://www.emdebian.org/debian
+keyring=emdebian-archive-keyring
+suite=stable
diff --git a/cross/sparc.conf b/cross/sparc.conf
new file mode 100644
index 0000000..d0c4c2e
--- /dev/null
+++ b/cross/sparc.conf
@@ -0,0 +1,11 @@
+[General]
+include=/usr/share/multistrap/crosschroot.conf
+omitrequired=false
+configscript=config.sh
+setupscript=setup.sh
+
+[Toolchains]
+packages=g++-4.2-arm-linux-gnueabi linux-libc-dev-armel-cross
+source=http://www.emdebian.org/debian
+keyring=emdebian-archive-keyring
+suite=stable
diff --git a/debian/changelog b/debian/changelog
index e6c2151..92ab66c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+multistrap (2.1.4) experimental; urgency=low
+
+  * Add support for multiple cross-toolchains in the chroot
+
+ -- Neil Williams <codehelp@debian.org>  Fri, 30 Apr 2010 18:11:16 +0100
+
 multistrap (2.1.3) experimental; urgency=low
 
   * Fix armel.conf to specify the right sources.