diff --git a/ChangeLog b/ChangeLog
index 1886f28f..f4ee9f42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-30 Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* configure.ac: Fix subdir handling.  Now finally, "make distcheck" will
+	include the documentation into the tarball even if the configure had been
+	run without the --enable-doc.
+
 2007-01-30 Joerg Wunsch <j@uriah.heep.sax.de>
 
 	* safemode.c: Obtain progname from avrdude.h rather than trying to roll our
diff --git a/configure.ac b/configure.ac
index 3f6949f1..646eabf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,14 +163,12 @@ AC_ARG_ENABLE(
 		esac],
 	[enabled_parport=yes])
 
-if test "$enabled_doc" = "yes"; then
-
-SUBDIRS_AC='doc @WINDOWS_DIRS@'
 DIST_SUBDIRS_AC='doc windows'
-else
 
-SUBDIRS_AC='@WINDOWS_DIRS@'
-DIST_SUBDIRS_AC='windows'
+if test "$enabled_doc" = "yes"; then
+	SUBDIRS_AC='doc @WINDOWS_DIRS@'
+else
+	SUBDIRS_AC='@WINDOWS_DIRS@'
 fi
 
 AC_SUBST(DOC_INST_DIR, $DOC_INST_DIR)
@@ -250,11 +248,8 @@ if test "$GCC" = yes; then
 fi
 AC_SUBST(ENABLE_WARNINGS,$ENABLE_WARNINGS)
 
-if test "$enabled_doc" = "yes"; then
-AC_CONFIG_FILES([doc/Makefile])
-fi
-
 AC_CONFIG_FILES([
+       doc/Makefile
        windows/Makefile
        avrdude.spec
        Makefile