diff --git a/.gitignore b/.gitignore
index c70dfb2a02c20..37a98c45a6baf 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 04682a56e9748..456fedf2d4704 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -6,30 +6,33 @@
 .header-section-number { display: none; }
 </style>
 
-[The Rust tutorial](tutorial.html)  ([PDF](tutorial.pdf))
-[The Rust reference manual](rust.html) ([PDF](rust.pdf))
+[The Rust tutorial](tutorial.html)  ([PDF](tutorial.pdf))  
+[The Rust reference manual](rust.html) ([PDF](rust.pdf))  
 
 # Guides
 
-[Pointers](guide-pointers.html)
-[References and Lifetimes](guide-lifetimes.html)
-[Containers and Iterators](guide-container.html)
-[Tasks and Communication](guide-tasks.html)
-[Foreign Function Interface](guide-ffi.html)
-[Macros](guide-macros.html)
-[Packaging](guide-rustpkg.html)
-[Testing](guide-testing.html)
+[Pointers](guide-pointers.html)  
+[References and Lifetimes](guide-lifetimes.html)  
+[Containers and Iterators](guide-container.html)  
+[Tasks and Communication](guide-tasks.html)  
+[Foreign Function Interface](guide-ffi.html)  
+[Macros](guide-macros.html)  
+[Packaging](guide-rustpkg.html)  
+[Testing](guide-testing.html)  
 [Conditions](guide-conditions.html)
 
 # Libraries
 
-[The standard library, `libstd`](std/index.html)
+[The standard library, `libstd`](std/index.html)  
 [The extra library, `libextra`](extra/index.html)
 
-[The M:N runtime library, `libgreen`](green/index.html)
+[The M:N runtime library, `libgreen`](green/index.html)  
 [The 1:1 runtime library, `libnative`](native/index.html)
 
-[The Rust parser, `libsyntax`](syntax/index.html)
+[The Rust libuv library, `librustuv`](rustuv/index.html)  
+[The Rust packaging library, `librustpkg`](rustpkg/index.html)
+
+[The Rust parser, `libsyntax`](syntax/index.html)  
 [The Rust compiler, `librustc`](rustc/index.html)
 
 # Tooling
@@ -38,14 +41,14 @@
 
 # FAQs
 
-[Language FAQ](complement-lang-faq.html)
-[Project FAQ](complement-project-faq.html)
-[Usage FAQ](complement-usage-faq.html)
-[Code cheatsheet](complement-cheatsheet.html) - "How do I do X?"
+[Language FAQ](complement-lang-faq.html)  
+[Project FAQ](complement-project-faq.html)  
+[Usage FAQ](complement-usage-faq.html)  
+[Code cheatsheet](complement-cheatsheet.html) - "How do I do X?"  
 [How to submit a bug report](complement-bugreport.html)
 
 # External resources
 
-The Rust [IRC channel](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust) - `#rust` on irc.mozilla.org
-The Rust community on [Reddit](http://reddit.com/r/rust)
+The Rust [IRC channel](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust) - `#rust` on irc.mozilla.org  
+The Rust community on [Reddit](http://reddit.com/r/rust)  
 The Rust [wiki](http://github.com/mozilla/rust/wiki)
diff --git a/mk/docs.mk b/mk/docs.mk
index d01ebb437702d..1982ab0050c13 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)))