diff --git a/debian/rules b/debian/rules
index 1dca398a..d74595c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,8 +42,8 @@ debian/%: debian/%.in
 override_dh_auto_configure: debian/libllvm$(LLVM_VERSION).install debian/llvm-$(LLVM_VERSION)-dev.links debian/libllvm-$(LLVM_VERSION)-ocaml-dev.dirs debian/llvm-$(LLVM_VERSION)-runtime.binfmt debian/llvm-$(LLVM_VERSION)-runtime.prerm
 	mkdir -p $(TARGET_BUILD)
 	mkdir -p clang/include/clang/Debian
-	sed -e "s|@DEB_HOST_MULTIARCH@|$(dpkg-architecture -qDEB_HOST_MULTIARCH)|" \
-		-e "s|@DEB_HOST_GNU_TYPE@|$(dpkg-architecture -qDEB_HOST_GNU_TYPE)|" \
+	sed -e "s|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|" \
+		-e "s|@DEB_HOST_GNU_TYPE@|$(DEB_HOST_GNU_TYPE)|" \
 		-e "s|@DEB_PATCHSETVERSION@|$(DEBIAN_REVISION)|" \
 		debian/debian_path.h > clang/include/clang/Debian/debian_path.h
 
@@ -71,6 +71,7 @@ override_dh_auto_configure: debian/libllvm$(LLVM_VERSION).install debian/llvm-$(
 	cd $(TARGET_BUILD) && \
 	  ../configure $(confargs) \
 	--prefix=/usr/lib/llvm-$(LLVM_VERSION) \
+	--bindir=\$${prefix}/bin/ \
 	--disable-assertions \
 	--enable-shared \
 	--enable-optimized \