diff --git a/ChangeLog b/ChangeLog
index f351395e..50f23d10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-06-23  Marcus Brinkmann  <marcus@g10code.de>
+
+	* configure.ac: Check for <sys/uio.h>.
+
+2004-06-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	Released 0.9.0.
+
+	* configure.ac (AC_INIT): Set version number to 0.9.0.
+	(LIBGPGME_LT_CURRENT, LIBGPGME_LT_AGE): Bump up by one.
+	(LIBGPGME_LT_REVISION): Reset to zero.
+
 2004-05-21  Marcus Brinkmann  <marcus@g10code.de>
 
 	* configure.ac (GPGME_CONFIG_API_VERSION): New variable,
diff --git a/assuan/ChangeLog b/assuan/ChangeLog
index e04663c6..f740e95e 100644
--- a/assuan/ChangeLog
+++ b/assuan/ChangeLog
@@ -1,5 +1,7 @@
 2004-06-23  Marcus Brinkmann  <marcus@g10code.de>
 
+	* assuan-domain-connect.c [HAVE_SYS_UIO_H]: Include <sys/uio.h>.
+
 	* assuan-handler.c: Include <errno.h>.
 
 2004-06-08  Marcus Brinkmann  <marcus@g10code.de>
diff --git a/assuan/assuan-domain-connect.c b/assuan/assuan-domain-connect.c
index ea35ba04..b92be3b8 100644
--- a/assuan/assuan-domain-connect.c
+++ b/assuan/assuan-domain-connect.c
@@ -29,6 +29,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#if HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/configure.ac b/configure.ac
index 4c0f3455..b2950263 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,11 +31,11 @@ AC_INIT(gpgme, 0.9.1-cvs, [bug-gpgme@gnupg.org])
 #   (Interfaces added:			AGE++)
 #   (Interfaces removed/changed:	AGE=0)
 #
-LIBGPGME_LT_CURRENT=13
+LIBGPGME_LT_CURRENT=14
 # Subtract 2 from this value if you want to make the LFS transition an
 # ABI break.  [Note to self: Remove this comment with the next regular break.]
-LIBGPGME_LT_AGE=2
-LIBGPGME_LT_REVISION=2
+LIBGPGME_LT_AGE=3
+LIBGPGME_LT_REVISION=0
 
 # If the API is changed in an incompatible way: increment the next counter.
 GPGME_CONFIG_API_VERSION=1
@@ -299,10 +299,15 @@ if test $ac_cv_func_funopen != yes; then
     fi
 fi
 
+# More assuan replacement functions.
 AC_REPLACE_FUNCS(isascii)
 AC_REPLACE_FUNCS(putc_unlocked)
 AC_REPLACE_FUNCS(memrchr)
 
+# More assuan checks.
+AC_CHECK_HEADERS([sys/uio.h])
+
+# End of assuan checks.
 
 AM_CONDITIONAL(BUILD_COMPLUS, test "$component_system" = "COM+")