diff --git a/doc/Makefile b/doc/Makefile
index 69fe55ecf..ffbbdf26e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -13,7 +13,12 @@ help:
 
 .PHONY: help Makefile
 
+# Ensure we clean the autodoc files when we clean
+clean:
+	-rm source/volatility.*.rst
+	@$(SPHINXBUILD) -M clean "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index dc828ec2e..154e3d2aa 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -23,12 +23,6 @@ import sphinx.ext.apidoc
 def setup(app):
     volatility_directory = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'volatility'))
 
-    # Ensure autodoc regenerates based on the current tree
-    for dir, _, files in os.walk(os.path.dirname(__file__)):
-        for filename in files:
-            if filename.startswith('volatility.'):
-                os.unlink(os.path.join(dir, filename))
-
     sphinx.ext.apidoc.main(argv = ['-e', '-M', '-f', '-T', '-o', 'source', volatility_directory])
 
     # Go through the volatility.framework.plugins files and change them to volatility.plugins