Index: m4/Makefile.am
===================================================================
--- m4/Makefile.am	(revision 10747)
+++ m4/Makefile.am	(working copy)
@@ -2,7 +2,6 @@
 	codeset.m4 \
 	gettext.m4 \
 	glibc21.m4 \
-	gnome-doc-utils.m4 \
 	iconv.m4 \
 	intltool.m4 \
 	isc-posix.m4 \
Index: configure.in
===================================================================
--- configure.in	(revision 10747)
+++ configure.in	(working copy)
@@ -10,7 +10,6 @@
 AM_INIT_AUTOMAKE([1.6.3 foreign])
 
 AC_CONFIG_MACRO_DIR([m4])
-GNOME_DOC_INIT
 
 RELEASE=0.SVN$(svnversion -n .)
 dnl RELEASE=0beta
@@ -30,13 +29,6 @@
 
 AM_SHARED_MIME
 AM_PACKAGER
-dnl This is a hack to disable scrollkeeper update when in the packager mode.
-dnl It may not seem good to purists, since we're defining
-dnl ENABLE_SK_{TRUE,FALSE} twice, but I cannot see any other way
-dnl without tweaking the gnome-doc-utils macros manually.
-dnl So, scrollkeeper update is enabled when it would normally be,
-dnl *provided* this is not the packager mode. Packager mode cancels it.
-AM_CONDITIONAL(ENABLE_SK, test "x$packager_mode" = "xfalse" -a "x$enable_scrollkeeper" = "xyes")
 AC_SUBST(RELEASE)
 AC_SUBST(VERSIONSTRING)
 
Index: INSTALL
===================================================================
--- INSTALL	(revision 10747)
+++ INSTALL	(working copy)
@@ -35,7 +35,6 @@
 The latter is possible, but you should supply additional arguments to
 autogen or configure:
    --with-mime-dir=$HOME/.local/share/mime
-   --disable-scrollkeeper
 Most likely, such local install will also need some prefix with write
 permissions for you:
    --prefix=$HOME/my_gramps_path
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 10747)
+++ Makefile.am	(working copy)
@@ -7,7 +7,7 @@
 	config.rpath autogen.sh \
 	FAQ COPYING \
 	intltool-extract.in intltool-merge.in intltool-update.in \
-	config.sub config.guess gnome-doc-utils.make
+	config.sub config.guess
 
 bin_SCRIPTS = gramps
 
@@ -18,8 +18,6 @@
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
 	gnome-doc-utils.make
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
-
 gramps: gramps.sh
 	cp gramps.sh gramps