diff --git a/.gitignore b/.gitignore
index 29b5574ce2..2c0139cf68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@ ChangeLog
 dist
 # Doc related
 doc/build
-doc/source/api/
+doc/source/contributor/api/
 # Development environment files
 .project
 .pydevproject
diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst
index 4438f2ad78..2aa9498f1b 100644
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -14,3 +14,4 @@
    specs/commands
    plugins
    humaninterfaceguide
+   api/modules
diff --git a/doc/source/index.rst b/doc/source/index.rst
index be421d20fa..3f63edb3b4 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -38,7 +38,6 @@ Contributor Documentation
    :maxdepth: 2
 
    contributor/index
-   api/modules
 
 Project Goals
 -------------
diff --git a/setup.cfg b/setup.cfg
index 86f315c139..73a9c42cfb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -701,6 +701,7 @@ autodoc_tree_excludes =
     openstackclient/volume/v3
     openstackclient/tests/
     openstackclient/tests/*
+api_doc_dir = contributor/api
 
 [build_sphinx]
 builders = html,man