diff --git a/.gitignore b/.gitignore
index f5edb89f0e..8a773970d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@ _build
 ######################
 genrst/
 /autoapi/
+/shared-bindings/**/*.rst
 
 # ctags and similar
 ###################
diff --git a/conf.py b/conf.py
index 3980ea8e1b..06aab271b2 100644
--- a/conf.py
+++ b/conf.py
@@ -79,6 +79,7 @@ autoapi_add_toctree_entry = False
 autoapi_options = ['members', 'undoc-members', 'private-members', 'show-inheritance', 'special-members', 'show-module-summary']
 autoapi_template_dir = 'docs/autoapi/templates'
 autoapi_python_use_implicit_namespaces = True
+autoapi_root = "shared-bindings"
 
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
diff --git a/ports/atmel-samd/README.rst b/ports/atmel-samd/README.rst
index a6881902e9..0746d1de06 100644
--- a/ports/atmel-samd/README.rst
+++ b/ports/atmel-samd/README.rst
@@ -21,4 +21,4 @@ Port Specific modules
 ---------------------
 
 .. toctree::
-    ../../autoapi/samd/index
+    ../../shared-bindings/samd/index
diff --git a/shared-bindings/index.rst b/shared-bindings/index.rst
index d941773943..bf04ae18b1 100644
--- a/shared-bindings/index.rst
+++ b/shared-bindings/index.rst
@@ -19,5 +19,5 @@ Modules
     :glob:
     :maxdepth: 2
 
-    ../autoapi/*/index
+    ../shared-bindings/*/index
     help