diff --git a/README.rst b/README.rst
index b2ec290d..9d91985a 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,15 @@
 oslo.utils
 ==========
 
-The Oslo Utils library provides support for common utility type functions,
+.. image:: https://pypip.in/version/oslo.utils/badge.svg
+    :target: https://pypi.python.org/pypi/oslo.utils/
+    :alt: Latest Version
+
+.. image:: https://pypip.in/download/oslo.utils/badge.svg?period=month
+    :target: https://pypi.python.org/pypi/oslo.utils/
+    :alt: Downloads
+
+The oslo.utils library provides support for common utility type functions,
 such as encoding, exception handling, string manipulation, and time handling.
 
 * Free software: Apache license
diff --git a/doc/source/api/index.rst b/doc/source/api/index.rst
deleted file mode 100644
index f193e3b6..00000000
--- a/doc/source/api/index.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-=====
- API
-=====
-
-.. toctree::
-   :maxdepth: 2
-   :glob:
-
-   *
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 1dce4d7f..62980267 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,17 +1,33 @@
+======================================
 Welcome to oslo.utils's documentation!
 ======================================
 
-Contents:
+The `oslo`_ utils library provides support for common utility type functions,
+such as encoding, exception handling, string manipulation, and time handling.
+
+.. toctree::
+   :maxdepth: 1
+
+   installation
+   usage
+   contributing
+   history
+
+API Documentation
+=================
 
 .. toctree::
    :maxdepth: 2
 
-   readme
-   installation
-   usage
-   api/index
-   contributing
-   history
+   api/encodeutils
+   api/eventletutils
+   api/excutils
+   api/fixture
+   api/importutils
+   api/netutils
+   api/strutils
+   api/timeutils
+   api/units
 
 Indices and tables
 ==================
@@ -19,3 +35,5 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
+
+.. _oslo: https://wiki.openstack.org/wiki/Oslo
diff --git a/doc/source/readme.rst b/doc/source/readme.rst
deleted file mode 100644
index a6210d3d..00000000
--- a/doc/source/readme.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../README.rst