diff --git a/package/Makefile.in b/package/Makefile.in
index a8f5650277..9d0e7d60ed 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -332,16 +332,6 @@ ifneq ($(BR2_LARGEFILE),y)
 DISABLE_LARGEFILE= --disable-largefile
 endif
 
-# The configure option varies, but since unknown options are ignored
-# we can pass all of them.
-DISABLE_DOCUMENTATION = \
-	--disable-gtk-doc \
-	--disable-doc \
-	--disable-docs \
-	--disable-documentation \
-	--with-xmlto=no \
-	--with-fop=no
-
 ifeq ($(BR2_INET_IPV6),y)
 DISABLE_IPV6= --enable-ipv6
 else
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index cfbdc27161..6f523353bb 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -109,7 +109,12 @@ define $(2)_CONFIGURE_CMDS
 		--exec-prefix=/usr \
 		--sysconfdir=/etc \
 		--program-prefix="" \
-		$$(DISABLE_DOCUMENTATION) \
+		--disable-gtk-doc \
+		--disable-doc \
+		--disable-docs \
+		--disable-documentation \
+		--with-xmlto=no \
+		--with-fop=no
 		$$(DISABLE_NLS) \
 		$$(DISABLE_LARGEFILE) \
 		$$(DISABLE_IPV6) \