diff --git a/autogen.sh b/autogen.sh
index a8771a8..532324c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,6 @@
 PROJECT=gtk-doc
 TEST_TYPE=-f
 FILE=gtk-doc.dsl.in
-CONFIGURE_FLAGS=
 
 # a silly hack that generates autoregen.sh but it's handy
 echo "#!/bin/sh" > autoregen.sh
@@ -69,7 +68,6 @@ if gnome-doc-prepare --version < /dev/null > /dev/null 2>&1; then
   echo "* Running gnome-doc-prepare"
   gnome-doc-prepare --copy --force --automake
 else
-  CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-scrollkeeper"
   touch gnome-doc-utils.make
 fi
 
@@ -92,7 +90,7 @@ $AUTOMAKE --add-missing -Wno-portability $am_opt || exit $?
 
 cd "$THEDIR"
 
-$srcdir/configure --enable-maintainer-mode "$@" $CONFIGURE_FLAGS || exit $?
+$srcdir/configure --enable-maintainer-mode "$@" || exit $?
 
 echo
 echo "Now type 'make install' to install $PROJECT."
diff --git a/configure.in b/configure.in
index 6d06c13..02638e9 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,9 @@ AC_CONFIG_SRCDIR([gtkdoc-common.pl.in])
 AM_INIT_AUTOMAKE([check-news std-options])
 AM_MAINTAINER_MODE
 
-GNOME_DOC_INIT
+dnl Forcing a non-null ACTION-IF-NOT-FOUND disables scrollkeeper if
+dnl gnome-doc-utils is not found but does not invalidate the build.
+GNOME_DOC_INIT([],[],[:])
 
 # make sure $ACLOCAL_FLAGS are used during a rebuild.
 AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
