diff --git a/ChangeLog b/ChangeLog
index 28bceea8..4916f011 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-29  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* autogen.sh: Expand autoreconf to avoid running autopoint.
+
 2010-08-29  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* po/shadow.pot, man/po/shadow-man-pages.pot: Regenerated.
diff --git a/autogen.sh b/autogen.sh
index 0796bd31..37197428 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,17 @@
 #! /bin/sh
-autoreconf -v -f --install || exit 1
+
+# FIXME: Find a way to run autoreconf again.
+# autopoint create mess in man/po
+#autoreconf -v -f --install || exit 1
+
+#autoreconf executes the following
+#autopoint --force
+aclocal --force 
+libtoolize --copy --force
+/usr/bin/autoconf --force
+/usr/bin/autoheader --force
+automake --add-missing --copy --force-missing
+
 ./configure \
 	CFLAGS="-O2 -Wall" \
 	--enable-man \