diff --git a/debian/changelog b/debian/changelog
index eabb268..6861ecb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ python-os-client-config (1.12.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Fixed (build-)depends for this release.
+  * Added support for DEB_BUILD_OPTIONS=nodocs.
 
  -- Thomas Goirand <zigo@debian.org>  Fri, 27 Nov 2015 12:15:09 +0100
 
diff --git a/debian/rules b/debian/rules
index 0089996..79132f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,8 +43,10 @@ override_dh_clean:
 	rm -rf build .testrepository
 
 override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 	sphinx-build -b html doc/source debian/python-os-client-config-doc/usr/share/doc/python-os-client-config-doc/html
 	dh_sphinxdoc -O--buildsystem=python_distutils
+endif
 
 # Commands not to run
 override_dh_installcatalogs: