diff --git a/debian/rules b/debian/rules
index 54ec00e763..60f0040b2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,13 +5,14 @@
 #export DH_VERBOSE=1
 
 RUST_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -f 1 -d '-' | cut -f 1-2 -d .)
-RUST_PREFIX := usr
+RUST_PREFIX := usr/lib/$(DEB_HOST_MULTIARCH)/rust/$(RUST_VERSION)
 DEB_DESTDIR := $(CURDIR)/debian/rust
 RUST_TMP_PREFIX := $(DEB_DESTDIR)/$(RUST_PREFIX)
 
 # These are the normal build flags
 COMMON_FLAGS = \
                --disable-manage-submodules \
+               --mandir=/usr/share/man \
                --prefix=/$(RUST_PREFIX)
 
 # TODO
@@ -41,9 +42,15 @@ override_dh_auto_configure:
 override_dh_auto_test:
 	true
 
+override_dh_shlibdeps:
+	LD_LIBRARY_PATH=$(RUST_TMP_PREFIX)/lib:$(LD_LIBRARY_PATH) \
+		dh_shlibdeps -l$(RUST_TMP_PREFIX)/lib
+
 override_dh_auto_install:
 	dh_auto_install
 	dh_link $(RUST_PREFIX)/bin/rustc usr/bin/rustc-$(RUST_VERSION)
+	dh_link usr/bin/rustc-$(RUST_VERSION) usr/bin/rustc
 	dh_link usr/share/man/man1/rustc.1 usr/share/man/man1/rustc-$(RUST_VERSION).1
 	dh_link $(RUST_PREFIX)/bin/rustdoc usr/bin/rustdoc-$(RUST_VERSION)
+	dh_link usr/bin/rustdoc-$(RUST_VERSION) usr/bin/rustdoc
 	dh_link usr/share/man/man1/rustdoc.1 usr/share/man/man1/rustdoc-$(RUST_VERSION).1