diff --git a/CHANGES b/CHANGES
index 253088f06..9d7d8473d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -81,6 +81,9 @@ Release 1.1 (in development)
 Release 1.0.7 (in development)
 ==============================
 
+* Fix a bug in the inheritance diagram exception that caused base
+  classes to be skipped if one of them is a builtin.
+
 * Fix general index links for C++ domain objects.
 
 * #332: Make admonition boundaries in LaTeX output visible.
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
index 524b2ffb6..34dead7e6 100644
--- a/doc/_templates/index.html
+++ b/doc/_templates/index.html
@@ -12,7 +12,7 @@
   <p>
     Sphinx is a tool that makes it easy to create intelligent and beautiful
     documentation, written by Georg Brandl and licensed under the BSD license.</p>
-  <p>It was originally created for <a href="http://docs.python.org/dev/">the
+  <p>It was originally created for <a href="http://docs.python.org/">the
     new Python documentation</a>, and it has excellent facilities for the
     documentation of Python projects, but C/C++ is already supported as well,
     and it is planned to add special support for other languages as well.  Of