diff --git a/ChangeLog b/ChangeLog
index ec894bf4..661117a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-15  Werner Koch  <wk@g10code.com>
+
+	* configure.ac: Create BUILD_FILEVERSION from SVN Revision.
+
+	* autogen.sh [W32]: Build shared and static versions of the library.
+
 2005-10-20  Marcus Brinkmann  <marcus@g10code.de>
 
 	* w32-dll/ChangeLog, w32-dll/build-dll, w32-dll/gpgme.def: Remove
diff --git a/autogen.sh b/autogen.sh
index 80e1136a..fe6a0209 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -75,8 +75,8 @@ if test "$1" = "--build-w32"; then
 
     ./configure --enable-maintainer-mode  --prefix=${w32root}  \
             --host=i586-mingw32msvc --build=${build} \
-            --with-gpg-error-prefix=${w32root}  \
-            --disable-shared --without-gpgsm
+            --with-gpg-error-prefix=${w32root} --without-gpgsm \
+            --enable-shared --enable-static
 
     exit $?
 fi
diff --git a/configure.ac b/configure.ac
index 831ca31d..cd165961 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,7 @@ AC_PREREQ(2.59)
 min_automake_version="1.9.3"
 
 # Version number: Remember to change it immediately *after* a release.
+#                 Make sure to run  "svn up" before a "make dist".
 AC_INIT(gpgme, 1.2.0-cvs, [bug-gpgme@gnupg.org])
 # LT Version numbers, remember to change them just *before* a release.
 #   (Code changed:			REVISION++)
@@ -446,12 +447,10 @@ if test "$have_w32_system" = yes; then
     BUILD_TIMESTAMP=`date --iso-8601=minutes`
     changequote(,)dnl 
     BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
+    tmp="`echo '$Revision$' | sed 's/[^0-9]//g'`"
     changequote([,])dnl
-    case "$VERSION" in
-      *-cvs) BUILD_FILEVERSION="${BUILD_FILEVERSION}0" ;;
-      *-rc*) BUILD_FILEVERSION="${BUILD_FILEVERSION}1" ;;
-      *)     BUILD_FILEVERSION="${BUILD_FILEVERSION}2" ;;
-    esac
+    test -z "$tmp" && tmp="0"
+    BUILD_FILEVERSION="${BUILD_FILEVERSION}$tmp"
 fi
 AC_SUBST(BUILD_TIMESTAMP)
 AC_SUBST(BUILD_FILEVERSION)
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index fc3a0f38..8db505cc 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -2154,7 +2154,7 @@ enabled.
 The @code{GPGME_KEYLIST_MODE_VALIDATE} symbol specifies that the
 backend should do key or certificate validation and not just get the
 validity information from an internal cache.  This might be an
-expensive operation and is in general not usefule.  Currently only
+expensive operation and is in general not useful.  Currently only
 implemented for the S/MIME backend and ignored for other backends.
 
 @end table
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index ec2040ea..b7fb4e45 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -2,6 +2,10 @@
 
 	* w32-io.c (_gpgme_io_spawn): Don't minimize window, hide it.
 
+2005-10-21  Werner Koch  <wk@g10code.com>
+
+	* Makefile.am: Fixed cut+paste problem
+
 2005-10-20  Marcus Brinkmann  <marcus@g10code.de>
 
 	* Makefile.am: Build versioninfo.lo, not versioninfo.o.  Also, fix