diff --git a/ChangeLog b/ChangeLog
index 6040d2663..ed8134b14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-17  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* autogen.sh: Try to continue even if we don't have gtk-doc
+	installed; this will obviously won't work if you don't pass
+	--disable-docs --disable-gtk-doc to autogen.sh as well.
+
 2008-04-17  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/clutter-fixed.[ch]: Add a ClutterFixed fundamental
diff --git a/autogen.sh b/autogen.sh
index 9c61882c0..386762d71 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,11 +12,17 @@ test $TEST_TYPE $FILE || {
         exit 1
 }
 
-gtkdocize || exit $?
+GTKDOCIZE=`which gtkdocize`
+if test -z $GTKDOCIZE; then
+        echo "*** No gtk-doc support ***"
+        touch gtk-doc.make
+else
+        gtkdocize || exit $?
+fi
 
 # back in the stupidity of autoreconf
 autoreconf -v --install || exit $?
 
-./configure "$@" ${GTK_DOC_ARGS}
+./configure "$@"
 
 echo "Now type 'make' to compile $PROJECT."