diff --git a/doc/rust.css b/doc/rust.css
index c49b0fee67ce..221f7996f101 100644
--- a/doc/rust.css
+++ b/doc/rust.css
@@ -101,4 +101,9 @@ td {
 #TOC ul {
     list-style: none;
     padding-left: 0px;
+}
+
+/* Adjust list alignment so rustdoc indexes don't align with blockquotes */
+div.index ul {
+    padding-left: 1em;
 }
\ No newline at end of file
diff --git a/src/librustdoc/markdown_pass.rs b/src/librustdoc/markdown_pass.rs
index 05f1c7242def..fbcf82ade2fd 100644
--- a/src/librustdoc/markdown_pass.rs
+++ b/src/librustdoc/markdown_pass.rs
@@ -436,6 +436,9 @@ fn write_index(ctxt: &Ctxt, index: doc::Index) {
         return;
     }
 
+    ctxt.w.put_line(~"<div class='index'>");
+    ctxt.w.put_line(~"");
+
     for index.entries.each |entry| {
         let header = header_text_(entry.kind, entry.name);
         let id = copy entry.link;
@@ -447,6 +450,8 @@ fn write_index(ctxt: &Ctxt, index: doc::Index) {
         }
     }
     ctxt.w.put_line(~"");
+    ctxt.w.put_line(~"</div>");
+    ctxt.w.put_line(~"");
 }
 
 #[test]