diff --git a/debian/changelog b/debian/changelog
index 768db5f792..7d21b2a677 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ rust (1.0.0~0alpha-0.1) unstable; urgency=low
   * New upstream release (Closes: #689207)
 
   [ Sylvestre Ledru ]
+  * Update the make install logic to install in debian/tmp/
+    instead of debian/rust and use the *.install files
+  * Introduce the rust-doc package
   * Move package to the Rust maintainers team
   * Update the uploaders/maintainer fields
   * Update of the vcs-* fields
diff --git a/debian/control b/debian/control
index 9e5e177ce5..d6948a024c 100644
--- a/debian/control
+++ b/debian/control
@@ -32,3 +32,17 @@ Description: Rust systems programming language
  Features: zero-cost abstractions; move semantics; guaranteed memory
  safety; threads without data races; trait-based generics; pattern
  matching; type inference; minimal runtime; efficient C bindings
+
+Package: rust-doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Rust systems programming language - Documentation
+ Rust is a systems programming language that runs blazingly fast,
+ prevents almost all crashes, and eliminates data races.
+ .
+ Features: zero-cost abstractions; move semantics; guaranteed memory
+ safety; threads without data races; trait-based generics; pattern
+ matching; type inference; minimal runtime; efficient C bindings
+ .
+ This package contains the documentation.
+
diff --git a/debian/rules b/debian/rules
index 37a060b821..d08801e8e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ DEBIAN_RUST_VERSION := \
 DEBIAN_RUST_VERSION_TYPE := \
 	$(shell echo $(UPSTREAM_RUST_VERSION) | cut -f 2 -d '-')
 RUST_PREFIX := usr/lib/$(DEB_HOST_MULTIARCH)/rust/$(DEBIAN_RUST_VERSION)
-DEB_DESTDIR := $(CURDIR)/debian/rust
+DEB_DESTDIR := $(CURDIR)/debian/tmp
 RUST_TMP_PREFIX := $(DEB_DESTDIR)/$(RUST_PREFIX)
 
 # These are the normal build flags
diff --git a/debian/rust-doc.install b/debian/rust-doc.install
new file mode 100644
index 0000000000..d45f5a2190
--- /dev/null
+++ b/debian/rust-doc.install
@@ -0,0 +1 @@
+usr/lib/*/rust/*/share/doc/rust/
diff --git a/debian/rust.install b/debian/rust.install
new file mode 100644
index 0000000000..13bc2aa7d8
--- /dev/null
+++ b/debian/rust.install
@@ -0,0 +1,2 @@
+usr/lib/*/rust/*/bin/
+usr/lib/*/rust/*/lib/