--- a/trunk/wharfie/wharfie.mk
+++ b/trunk/wharfie/wharfie.mk
@@ -93,7 +93,8 @@
 #
 debian_toolchain.tar:
 	-mkdir ./$$(basename $@ .tar)
-	${SUDO} ${DBOOTSTRAP} --arch=i386 --variant=minbase --include="gcc${GCC_POSTFIX} libstdc++-6-dev${LIBC_POSTFIX} libc6-dev${LIBC_POSTFIX}" ${DEBIAN_VERSION} ./$$(basename $@ .tar) http://ftp.debian.org/debian/
+	${SUDO} ${DBOOTSTRAP} --arch=amd64 --variant=minbase --include="${ADDITIONAL_TOOLCHAIN_PACKAGES} gcc${GCC_POSTFIX} g++${GCC_POSTFIX} libc6-dev${LIBC_POSTFIX}" ${DEBIAN_VERSION} ./$$(basename $@ .tar) http://ftp.debian.org/debian/
+	${SUDO} chroot ./$$(basename $@ .tar) ldconfig
 	cd $$(basename $@ .tar); ${SUDO} tar -cf "../$@" .
 	${SUDO} rm -R ./$$(basename $@ .tar)