diff --git a/docs/Makefile b/docs/Makefile
index e6adc31c0ab428f4605e2fd3335baea55119d668..eb44e95ecbb9bc4079613db7f5d1e95ed4359691 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -2,7 +2,8 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    =
+# TODO fix sphinx warnings instead of suppressing them...
+SPHINXOPTS    = -Q
 SPHINXBUILD   = python -msphinx
 SPHINXPROJ    = flatland
 SOURCEDIR     = .
diff --git a/make_docs.py b/make_docs.py
index 8cc1124a6fe624fe5afff416450a0a5d30d654ca..5d27230fc82a5eb82550d5bef44a7f6f0942d368 100644
--- a/make_docs.py
+++ b/make_docs.py
@@ -24,7 +24,8 @@ subprocess.call(['sphinx-apidoc', '-o', 'docs/', 'flatland'])
 os.environ["SPHINXPROJ"] = "flatland"
 os.chdir('docs')
 subprocess.call(['python', '-msphinx', '-M', 'clean', '.', '_build'])
-subprocess.call(['python', '-msphinx', '-M', 'html', '.', '_build'])
-subprocess.call(['python', '-mpydeps', '../flatland', '-o', '_build/html/flatland.svg'])
+# TODO fix sphinx warnings instead of suppressing them...
+subprocess.call(['python', '-msphinx', '-M', 'html', '.', '_build', '-Q'])
+subprocess.call(['python', '-mpydeps', '../flatland', '-o', '_build/html/flatland.svg', '--no-config', '--noshow'])
 
 browser('_build/html/index.html')