diff --git a/debian/rules b/debian/rules
index 0c18808..170ffb1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -764,7 +764,6 @@ endif
 # - libc6 gets copyright and changelog
 # - libc6 gets dependencies removed (no dependency on libgcc1)
 # - libc6-dev-armhf-cross ships symlink to /usr/arm-linux-gnueabi/lib/hf for multilib cross compiler
-# - libc6-sparc64-cross: Remove /usr/sparc64-linux-gnu/lib/ld-linux.so.2
 
 $(stamp)repack-%:
 	@echo START $@
@@ -827,10 +826,6 @@ $(stamp)repack-%:
 	        >> $$tmp/usr/share/lintian/overrides/$$pkgname; \
 	    fi; \
 	esac; \
-	case "$$pkgname" in \
-	  libc6-sparc64-cross) \
-	    rm -f $$tmp/usr/*/lib/ld-linux.so.2;; \
-	esac; \
 	case "$$pkgname" in \
 	  libc6-dev-powerpc-ppc64-cross|libc6-dev-s390-s390x-cross) \
 	    sed -i -e 's,/lib[^/]*/ld.so.1,/lib32/ld.so.1,' \
@@ -841,6 +836,14 @@ $(stamp)repack-%:
 	    sed -i -e 's,/lib[^/]*/ld-linux.so.2,/lib32/ld-linux.so.2,' \
 	      $$tmp/usr/*/lib32/libc.so;; \
 	esac; \
+	case "$$pkgname" in \
+	  libc6-dev-powerpc-ppc64-cross|libc6-dev-sparc-sparc64-cross|libc6-dev-i386-x32-cross|libc6-dev-s390-s390x-cross|libc6-dev-i386-amd64-cross|libc6-dev-i386-x32-cross) \
+	    triplet="$(basename $(dirname $(echo $$tmp/usr/*/lib32)))"; \
+	    sed -i \
+	      -e "s, /lib32/libc, /usr/$$triplet/lib32/libc," \
+	      -e "s, /usr/lib32/libc, /usr/$$triplet/lib32/libc," \
+	      $$tmp/usr/*/lib32/libc.so;; \
+	esac; \
 	if [ 'lib$(libgcc_base)1-dbg-$${cross_arch}-cross' = $$pkgname ]; then \
 	  sed -i -e 's/^Depends.*/Depends: lib$(libgcc_base)1-$${cross_arch}-cross (= 1:${DEB_VER_GCC}$(CROSS_EXT))/g' $$tmp/DEBIAN/control; \
 	  ln -sf lib$(libgcc_base)1-$${cross_arch}-cross $$tmp/usr/share/doc/lib$(libgcc_base)1-dbg-$${cross_arch}-cross; \
@@ -1189,7 +1192,8 @@ $(stamp)dc-%: build
 	esac; \
 	echo dpkg-cross $$deb ...; \
 	echo "default_arch = undefined" > debian/cross-compile; \
-	PKG_IGNORE_CURRENTLY_BUILDING=1 debian/dpkg-cross -M -a $$arch \
+	set -x; \
+	PKG_IGNORE_CURRENTLY_BUILDING=1 debian/dpkg-cross -A -M -a $$arch \
 	    -X dpkg -X findutils -X tzdata -X libc-bin -X libc-dev-bin \
 	    -X debconf -X debconf-2.0 \
 	    -b $$deb
