diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index a1a4f955e..548ec24dd 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -109,6 +109,8 @@ class Gencontrol(Base):
         makeflags = makeflags.copy()
         makeflags['ALL_FEATURESETS'] = ' '.join(fs_enabled)
         makeflags['ALL_TRIPLETS'] = ' '.join(triplet_enabled)
+        if not self.config.merge('docs', None, None).get('enabled', True):
+            makeflags['DO_DOCS'] = False
         super(Gencontrol, self).do_main_makefile(makefile, makeflags, extra)
 
         # linux-source-$UPSTREAMVERSION will contain all kconfig files
diff --git a/debian/rules.real b/debian/rules.real
index bced6ad5b..62d80721d 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -63,13 +63,17 @@ ifeq ($(MODULES),True)
   binary-arch-flavour: install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 endif
 
-binary-indep: install-doc
-binary-indep: install-manual
+ifneq ($(DO_DOCS),False)
+  binary-indep: install-doc
+  binary-indep: install-manual
+  build-indep: $(STAMPS_DIR)/build-doc
+else
+  build-indep:
+endif
 binary-indep: install-source
 binary-indep: install-support
 
 build-arch: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
-build-indep: $(STAMPS_DIR)/build-doc
 
 setup-flavour: $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)