diff --git a/doc/api/core.rst b/doc/api/core.rst
new file mode 100644
index 00000000000..05ddf177698
--- /dev/null
+++ b/doc/api/core.rst
@@ -0,0 +1,10 @@
+
+.. _openerp library:
+
+Server-side library
+-------------------
+
+.. automodule:: openerp
+   :members:
+   :undoc-members:
+
diff --git a/doc/api/models.rst b/doc/api/models.rst
new file mode 100644
index 00000000000..143147c0f48
--- /dev/null
+++ b/doc/api/models.rst
@@ -0,0 +1,7 @@
+
+ORM and models
+--------------
+
+.. automodule:: openerp.osv.orm
+   :members:
+   :undoc-members:
diff --git a/doc/api.rst b/doc/api/startup.rst
similarity index 63%
rename from doc/api.rst
rename to doc/api/startup.rst
index 32044b7feb8..98e8f6ac3c3 100644
--- a/doc/api.rst
+++ b/doc/api/startup.rst
@@ -1,22 +1,3 @@
-.. _api:
-
-OpenERP API Reference
-=====================
-
-.. image:: _static/openerp.png
-   :alt: OpenERP framework logo
-   :class: floatingflask
-
-Welcome to OpenERP API reference.
-
-.. _openerp library:
-
-Server-side library
--------------------
-
-.. automodule:: openerp
-   :members:
-   :undoc-members:
 
 Start-up script
 ---------------
@@ -37,9 +18,3 @@ into one of the WSGI entry points of the server.
 
 .. versionadded:: 6.1
 
-ORM and models
---------------
-
-.. automodule:: openerp.osv.orm
-   :members:
-   :undoc-members:
diff --git a/doc/conf.py b/doc/conf.py
index 090276d974e..eea377ab5c4 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -38,7 +38,7 @@ source_suffix = '.rst'
 #source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'api'
+master_doc = 'index'
 
 # General information about the project.
 project = u'OpenERP Technical Documentation'
diff --git a/doc/index.rst.inc b/doc/index.rst.inc
index 6903d9527b6..8b3a485f16e 100644
--- a/doc/index.rst.inc
+++ b/doc/index.rst.inc
@@ -8,5 +8,7 @@ functions, classes, and method.
 .. toctree::
    :maxdepth: 2
 
-   api
+   api/core
+   api/startup
+   api/models