diff --git a/.gitignore b/.gitignore
index c70dfb2a02c..37a98c45a6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,6 +80,7 @@ src/.DS_Store
 /doc/rustc
 /doc/syntax
 /doc/rustuv
+/doc/rustpkg
 /nd/
 /llvm/
 version.md
diff --git a/doc/index.md b/doc/index.md
index 04682a56e97..39d535a5aeb 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -29,6 +29,8 @@
 [The M:N runtime library, `libgreen`](green/index.html)
 [The 1:1 runtime library, `libnative`](native/index.html)
 
+[The Rust packaging library, `librustpkg`](rustpkg/index.html)
+
 [The Rust parser, `libsyntax`](syntax/index.html)
 [The Rust compiler, `librustc`](rustc/index.html)
 
diff --git a/mk/docs.mk b/mk/docs.mk
index d01ebb43770..1982ab0050c 100644
--- a/mk/docs.mk
+++ b/mk/docs.mk
@@ -289,7 +289,8 @@ RUSTDOC = $(HBIN2_H_$(CFG_BUILD))/rustdoc$(X_$(CFG_BUILD))
 #
 # Passes --cfg stage2 to rustdoc because it uses the stage2 librustc.
 define libdoc
-doc/$(1)/index.html: $$(RUSTDOC) $$(TLIB2_T_$(3)_H_$(3))/$(CFG_STDLIB_$(3))
+doc/$(1)/index.html: $$(RUSTDOC) $$(TLIB2_T_$(3)_H_$(3))/$(CFG_STDLIB_$(3)) \
+		$(foreach name,$(4),$$(TLIB2_T_$(3)_H_$(3))/$$(CFG_$(name)_$(3)))
 	@$$(call E, rustdoc: $$@)
 	$(Q)$(RUSTDOC) --cfg stage2 $(2)
 
@@ -309,6 +310,7 @@ $(eval $(call libdoc,extra,$(EXTRALIB_CRATE),$(CFG_BUILD)))
 $(eval $(call libdoc,native,$(LIBNATIVE_CRATE),$(CFG_BUILD)))
 $(eval $(call libdoc,green,$(LIBGREEN_CRATE),$(CFG_BUILD)))
 $(eval $(call libdoc,rustuv,$(LIBRUSTUV_CRATE),$(CFG_BUILD)))
+$(eval $(call libdoc,rustpkg,$(RUSTPKG_LIB),$(CFG_BUILD),EXTRALIB LIBRUSTC))
 
 $(eval $(call compiledoc,rustc,$(COMPILER_CRATE),$(CFG_BUILD)))
 $(eval $(call compiledoc,syntax,$(LIBSYNTAX_CRATE),$(CFG_BUILD)))