All manual pages need a special EXTRA_DIST statement
diff --git a/Makefile.am b/Makefile.am
index 995b7e4..b5845a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -260,14 +260,7 @@
 
 pkgconfig_DATA = bluez.pc
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules \
-				--enable-bccmd \
-				--enable-dfutool \
-				--enable-hid2hci \
-				--enable-hidd \
-				--enable-pand \
-				--enable-dund \
-				--enable-test
+DISTCHECK_CONFIGURE_FLAGS =
 
 DISTCLEANFILES = $(pkgconfig_DATA)
 
diff --git a/Makefile.tools b/Makefile.tools
index 037008c..18f8b87 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -49,6 +49,10 @@
 dist_man_MANS += rfcomm/rfcomm.1 tools/l2ping.8 \
 			tools/hciattach.8 tools/hciconfig.8 \
 			tools/hcitool.1 tools/sdptool.1 tools/ciptool.1
+else
+EXTRA_DIST += rfcomm/rfcomm.1 tools/l2ping.8 \
+			tools/hciattach.8 tools/hciconfig.8 \
+			tools/hcitool.1 tools/sdptool.1 tools/ciptool.1
 endif
 
 CLEANFILES += rfcomm/lexer.c rfcomm/parser.c rfcomm/parser.h
@@ -70,6 +74,8 @@
 endif
 
 dist_man_MANS += tools/bccmd.8
+else
+EXTRA_DIST += tools/bccmd.8
 endif
 
 if HID2HCI
@@ -78,6 +84,8 @@
 tools_hid2hci_LDADD = @USB_LIBS@
 
 dist_man_MANS += tools/hid2hci.8
+else
+EXTRA_DIST += tools/hid2hci.8
 endif
 
 if DFUTOOL
@@ -87,6 +95,8 @@
 tools_dfutool_LDADD = @USB_LIBS@
 
 dist_man_MANS += tools/dfutool.1
+else
+EXTRA_DIST += tools/dfutool.1
 endif
 
 
@@ -98,6 +108,8 @@
 tools_avctrl_LDADD = @USB_LIBS@
 
 dist_man_MANS += tools/dfubabel.1 tools/avctrl.8
+else
+EXTRA_DIST += tools/dfubabel.1 tools/avctrl.8
 endif
 
 
@@ -152,7 +164,9 @@
 
 dist_man_MANS += test/rctest.1 test/hciemu.1
 
-dist_noinst_MANS += test/bdaddr.8
+EXTRA_DIST += test/bdaddr.8
+else
+EXTRA_DIST += test/rctest.1 test/hciemu.1 test/bdaddr.8
 endif
 
 EXTRA_DIST += test/apitest test/hsplay test/hsmicro test/dbusdef.py \
@@ -173,6 +187,8 @@
 compat_hidd_LDADD = -lm lib/libbluetooth.la
 
 dist_man_MANS += compat/hidd.1
+else
+EXTRA_DIST += compat/hidd.1
 endif
 
 if PAND
@@ -184,6 +200,8 @@
 compat_pand_LDADD = lib/libbluetooth.la
 
 dist_man_MANS += compat/pand.1
+else
+EXTRA_DIST += compat/pand.1
 endif
 
 if DUND
@@ -195,4 +213,6 @@
 compat_dund_LDADD = lib/libbluetooth.la
 
 dist_man_MANS += compat/dund.1
+else
+EXTRA_DIST += compat/dund.1
 endif