diff --git a/Makefile.in b/Makefile.in
index 10531bae6..0e0d7607a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -139,10 +139,13 @@ DISTFILES1 = $(INFOS) .gitignore \
 	docs/CONTRIBUTING.rst \
 	docs/CONTRIBUTORS \
 	docs/Makefile \
-	docs/_static/* \
+	docs/_static/*.png \
+	docs/_static/css/* \
 	docs/bin/* \
 	docs/gen/* \
-	docs/guide/* \
+	docs/guide/*.py \
+	docs/guide/*.rst \
+	docs/guide/figures/* \
 	docs/install.rst \
 	docs/internals.rst \
 	docs/internals.rst \
diff --git a/docs/guide/conf.py b/docs/guide/conf.py
index 0602f1250..a4ef9e545 100644
--- a/docs/guide/conf.py
+++ b/docs/guide/conf.py
@@ -67,7 +67,8 @@ extensions = []
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = [
-    '_build', 'Thumbs.db', '.DS_Store', 'internals.rst', 'xml.rst', 'gen/ex_*'
+    '_build', 'Thumbs.db', '.DS_Store', 'internals.rst', 'xml.rst', 'gen/ex_*',
+    'CONTRIBUTING.rst'
 ]
 
 # Warn about refs
diff --git a/docs/_static/fig_gantt_min.png b/docs/guide/figures/fig_gantt_min.png
similarity index 100%
rename from docs/_static/fig_gantt_min.png
rename to docs/guide/figures/fig_gantt_min.png
diff --git a/docs/guide/simulating.rst b/docs/guide/simulating.rst
index e817dae4c..39ebf1464 100644
--- a/docs/guide/simulating.rst
+++ b/docs/guide/simulating.rst
@@ -304,7 +304,7 @@ The :command:`verilator_gantt` program may then be run to transform the
 saved profiling file into a nicer visual format and produce some related
 statistics.
 
-.. figure:: ../_static/fig_gantt_min.png
+.. figure:: figures/fig_gantt_min.png
 
    Example verilator_gantt output, as viewed with GTKWave.