diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5c8f297f..e478befe 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,7 +2,7 @@
 Changelog
 =========
 
-Changes in dev
+Changes in 0.6
 ==============
 
 - No longer always upsert on save for items with a '_id'
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index a7d48f7c..1565c50c 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -431,6 +431,12 @@ If a dictionary is passed then the following options are available:
 :attr:`unique` (Default: False)
     Whether the index should be sparse.
 
+.. warning::
+
+
+   Inheritance adds extra indices.
+   If don't need inheritance for a document turn inheritance off - see :ref:`document-inheritance`.
+
 
 Geospatial indexes
 ---------------------------
@@ -447,7 +453,7 @@ point. To create a geospatial index you must prefix the field with the
         location = DictField()
         meta = {
             'indexes': [
-                '*location.point', 
+                '*location.point',
             ],
         }
 
@@ -511,6 +517,8 @@ This ensures that the shard key is sent with the query when calling the
             'shard_key': ('machine', 'timestamp',)
         }
 
+.. _document-inheritance:
+
 Document inheritance
 ====================
 
diff --git a/docs/index.rst b/docs/index.rst
index ef225e44..a701de29 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -19,7 +19,7 @@ MongoDB. To install it, simply run
   The complete API documentation.
 
 :doc:`upgrade`
-  The Upgrade guide.
+  How to upgrade MongoEngine.
 
 :doc:`django`
   Using MongoEngine and Django