diff --git a/ChangeLog b/ChangeLog
index ecdfde43a..591d59cb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	Released 2.0.3.
 
+	* autogen.sh: Add option --force.
+
 2007-01-31  Werner Koch  <wk@g10code.com>
 
 	Released 2.0.2.
diff --git a/autogen.sh b/autogen.sh
index 8a20b1a38..c9bf2d58a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -39,6 +39,11 @@ GETTEXT=${GETTEXT_PREFIX}${GETTEXT:-gettext}${GETTEXT_SUFFIX}
 MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
 
 DIE=no
+FORCE=
+if test "$1" == "--force"; then
+  FORCE=" --force"
+  shift
+fi
 
 # ***** W32 build script *******
 # Used to cross-compile for Windows.
@@ -198,7 +203,7 @@ echo "Running autoheader..."
 $AUTOHEADER
 echo "Running automake --gnu ..."
 $AUTOMAKE --gnu;
-echo "Running autoconf..."
-$AUTOCONF
+echo "Running autoconf${FORCE} ..."
+$AUTOCONF${FORCE}
 
 echo "You may now run \"./configure --sysconfdir=/etc --enable-maintainer-mode && make\"."
diff --git a/configure.ac b/configure.ac
index 71a822ba1..80175f5c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ min_automake_version="1.9.3"
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 m4_define([my_version], [2.0.3])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \