diff --git a/xqf/Makefile.am b/xqf/Makefile.am
index 334c967..74454e5 100644
--- a/xqf/Makefile.am
+++ b/xqf/Makefile.am
@@ -1,3 +1,3 @@
 EXTRA_DIST = BUGS acconfig.h autogen.sh clean.sh
 
-SUBDIRS = intl po src announce debian
+SUBDIRS = intl po src debian
diff --git a/xqf/autogen.sh b/xqf/autogen.sh
index 131a4f7..b956f39 100755
--- a/xqf/autogen.sh
+++ b/xqf/autogen.sh
@@ -1,3 +1,4 @@
+libtoolize
 aclocal
 autoheader
 automake -a
diff --git a/xqf/configure.in b/xqf/configure.in
index 5344743..d7c199f 100644
--- a/xqf/configure.in
+++ b/xqf/configure.in
@@ -5,7 +5,7 @@
 
 AC_INIT(src/xqf.c)
 
-AM_INIT_AUTOMAKE(xqf, 0.9.6g-2408)
+AM_INIT_AUTOMAKE(xqf, 0.9.6g)
 dnl AM_CONFIG_HEADER(src/gnuconfig.h:src/gnuconfig.h.in)
 AM_CONFIG_HEADER(src/gnuconfig.h)
 
@@ -112,5 +112,5 @@ if test "$USE_INCLUDED_LIBINTL" = "yes"; then
 fi
 
 AC_OUTPUT([Makefile intl/Makefile po/Makefile.in \
-src/Makefile src/xpm/Makefile announce/Makefile \
+src/Makefile src/xpm/Makefile \
 debian/Makefile])
diff --git a/xqf/src/.cvsignore b/xqf/src/.cvsignore
index 1717318..f815e84 100644
--- a/xqf/src/.cvsignore
+++ b/xqf/src/.cvsignore
@@ -1,3 +1,8 @@
 gnuconfig.h
 Makefile
 Makefile.in
+stamp-h.in
+stamp-h
+.libs
+.deps
+xqf