diff --git a/ChangeLog b/ChangeLog
index bd06969b10..3306a27a49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-21  Sven Neumann  <sven@gimp.org>
+
+	* autogen.sh: also look for automake-1.10.
+
 2007-05-21  Sven Neumann  <sven@gimp.org>
 
 	* app/core/gimp.c (gimp_message): documentation.
diff --git a/autogen.sh b/autogen.sh
index a7d41c3d72..843be87197 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -160,6 +160,9 @@ echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
 if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=$AUTOMAKE
    ACLOCAL=$ACLOCAL
+elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake-1.10
+   ACLOCAL=aclocal-1.10
 elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake-1.9
    ACLOCAL=aclocal-1.9
diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog
index c1deadc279..f10e7ff944 100644
--- a/devel-docs/ChangeLog
+++ b/devel-docs/ChangeLog
@@ -1,7 +1,7 @@
 2007-05-21  Sven Neumann  <sven@gimp.org>
 
 	* app/Makefile.am: do nothing unless configured with
-	--enable-gtk-doc-app.
+	--enable-gtk-doc-app. Removed dist-hook override.
 
 2007-05-14  Sven Neumann  <sven@gimp.org>
 
diff --git a/devel-docs/app/Makefile.am b/devel-docs/app/Makefile.am
index d636ac34e2..142545afdb 100644
--- a/devel-docs/app/Makefile.am
+++ b/devel-docs/app/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-if ENABLE_GTK_DOC_APP
-
 # The name of the module.
 DOC_MODULE = app
 
@@ -110,15 +108,20 @@ GTKDOC_LIBS = \
         $(INTLLIBS)
 
 
+if ENABLE_GTK_DOC_APP
+
 include $(top_srcdir)/gtk-doc.make
 
+else
+
+EXTRA_DIST = \
+	$(DOC_MODULE)-docs.sgml		\
+	$(DOC_MODULE)-overrides.txt	\
+	$(DOC_MODULE)-sections.txt
+
+endif
+
 # Other files to distribute
 EXTRA_DIST += \
 	$(DOC_MODULE).types	\
 	version.in
-
-endif
-
-# Override dist-hook as we don't want to distribute generated files
-dist-hook:
-	@true