diff --git a/packages/toolchain/toolchains/darwin-cross/unpack b/packages/toolchain/toolchains/darwin-cross/unpack
index 0f3856fa43..3c205c95ef 100755
--- a/packages/toolchain/toolchains/darwin-cross/unpack
+++ b/packages/toolchain/toolchains/darwin-cross/unpack
@@ -23,5 +23,17 @@
 
 . config/options $1
 
-tar -xzf "${PKG_BUILD}/darwin-cross.tar.gz" -C "${PKG_BUILD}"
-mv "${PKG_BUILD}/darwin-cross/"* "${PKG_BUILD}"
+# extract toolchain
+  tar -xzf $PKG_BUILD/darwin-cross.tar.gz -C $PKG_BUILD
+
+# move toolchain to a proper location
+  mv $PKG_BUILD/darwin-cross/* $PKG_BUILD
+
+# cleanup
+  rm -rf $PKG_BUILD/darwin-cross/
+  rm -rf $PKG_BUILD/darwin-cross.tar.gz
+  rm -rf $PKG_BUILD/install_darwin-cross.sh
+
+# fix 'as'
+  rm -rf $PKG_BUILD/i386-apple-darwin8/bin/as
+  ln -sf $ROOT/$PKG_BUILD/libexec/10.4/as/i386/as $PKG_BUILD/i386-apple-darwin8/bin/as