diff --git a/Makefile b/Makefile
index bdbbfe7f..0e3b4f87 100644
--- a/Makefile
+++ b/Makefile
@@ -19,20 +19,9 @@ stylecheck:
 .PHONY: checks
 checks: typecheck stylecheck
 
-
-.PHONY: genautodocs
-genautodocs: 
-	rm -rf docs/.generated
-	mkdir docs/.generated
-	sphinx-apidoc -f -o docs/.generated src/
-	
-
 .PHONY: docs
-docs: genautodocs docs-noauto
-
-
-.PHONY: docs-noauto
-docs-noauto:
+docs:
+	rm -rf docs/.generated
 	sphinx-build -W -b html docs docs/.build/
 
 .PHONY: style
diff --git a/docs/conf.py b/docs/conf.py
index 5b3c6c4d..3ac8b388 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -4,6 +4,7 @@
 import sys
 
 import sphinx_rtd_theme
+from sphinx.ext.apidoc import main
 
 needs_sphinx = '1.6'
 
@@ -34,7 +35,8 @@
 autodoc_typehints = "description"
 
 
-src_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '../src'))
+script_dir = os.path.normpath(os.path.dirname(__file__))
+src_dir = os.path.abspath(os.path.join(script_dir, '../src'))
 
 print(src_dir + "/")
 
@@ -42,7 +44,22 @@
 
 import psi
 
-
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3', None),
 }
+
+# -- Setup for Sphinx API Docs -----------------------------------------------
+
+# Workaround since sphinx does not automatically run apidoc before a build
+# Copied from https://github.com/readthedocs/readthedocs.org/issues/1139
+
+# run api doc
+def run_apidoc(_):
+    output_path = os.path.join(script_dir, '.generated')
+    print(f"OUTPUT PATH = {output_path}")
+    #exclusions = [os.path.join(src_dir, 'setup.py'),]
+    main(['-f', '-o', output_path, src_dir])
+
+# launch setup
+def setup(app):
+    app.connect('builder-inited', run_apidoc)
\ No newline at end of file