diff --git a/config/configure.ac b/config/configure.ac
index f3df9b60..210e0149 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(Exiv2, 0.8, ahuggel@gmx.net)
+AC_INIT(Exiv2, 0.9, ahuggel@gmx.net)
 AC_CONFIG_SRCDIR([src/exif.cpp])
 AC_CONFIG_HEADER([./config/config.h])
 AC_CONFIG_AUX_DIR([./config])
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 52590655..cc870c13 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,28 @@
+Changes from version 0.8 to 0.9
+-------------------------------
+
+* Exiv2 utility
+	- 0000450: [exif] Added action "fixiso" to copy the ISO setting from Nikon 
+	           Makernotes to the regular Exif tag Exif.Photo.ISOSpeedRatings.
+	- 0000448: [tools] Added options -p and -t, -T to preserve file timestamps and
+	           set the timestamp according to the Exif timestamp.
+	           (Thanks to Stephan Ahlswede for suggesting the -p feature)
+	- 0000446: [misc] Added option -c to set the JPEG comment to the utility.
+	           (Thanks to Tristan Savatier for the suggestion)
+
+* Exiv2 library
+	- 0000447: [iptc] Fixed a buffer overflow in sscanf. (Thanks to Maciek for 
+	           reporting this bug and the hard work to recreate it)
+	- 0000438: [exif] Write support for Canon raw images.
+		 - [exif] Updated Nikon lensdata to v2.00 of Robert Rottmerhusen's 
+		   amazing lens database. (Thanks to Robert for keeping me updated.)
+		 - [build environment] Added an option to enable/disable dependency-
+	           tracking to the configure script, which is useful to create 
+		   "Universal Binaries" under Mac OSX. 
+		   (Thanks to Will Stokes for the suggestion)
+	         - [exivsimple] Changed DllTypeId::time and DllTypeId::date to
+	           DllTypeId::isoTime and DllTypeId::isoDate to avoid a name clash.
+
 Changes from version 0.7 to 0.8
 -------------------------------
 
diff --git a/src/doxygen.hpp b/src/doxygen.hpp
index ebbaf92d..f1199d05 100644
--- a/src/doxygen.hpp
+++ b/src/doxygen.hpp
@@ -8,7 +8,7 @@
   @date    07-Feb-04, ahu: created
  */
 /*!
-  @mainpage Exif and Iptc metadata manipulation library and tools v0.8
+  @mainpage Exif and Iptc metadata manipulation library and tools v0.9
 
   @section overview Exiv2 Overview
 
@@ -82,12 +82,12 @@ bug tracking system</a>.</p>
 
   @verbatim $ svn checkout svn://dev.robotbattle.com/exiv2/trunk . @endverbatim
 
-  <p>To download the test data and test drivers for version 0.8 from
-  the repository, change to your local exiv2-0.8 directory and use the
+  <p>To download the test data and test drivers for version 0.9 from
+  the repository, change to your local exiv2-0.9 directory and use the
   following command:
   </p>
 
-  @verbatim $ svn export svn://dev.robotbattle.com/exiv2/tags/0.8/test @endverbatim
+  @verbatim $ svn export svn://dev.robotbattle.com/exiv2/tags/0.9/test @endverbatim
 
   <P>If you'd like to contribute code, please <A HREF="mailto:ahuggel@gmx.net">contact me</A>.
 
diff --git a/src/exv_msvc.h b/src/exv_msvc.h
index 49d0c105..c712bd9b 100644
--- a/src/exv_msvc.h
+++ b/src/exv_msvc.h
@@ -23,13 +23,13 @@
 #define EXV_PACKAGE_NAME "Exiv2"
 
 /* Define to the full name and version of this package. */
-#define EXV_PACKAGE_STRING "Exiv2 0.8"
+#define EXV_PACKAGE_STRING "Exiv2 0.9"
 
 /* Define to the one symbol short name of this package. */
 #define EXV_PACKAGE_TARNAME "exiv2"
 
 /* Define to the version of this package. */
-#define EXV_PACKAGE_VERSION "0.8"
+#define EXV_PACKAGE_VERSION "0.9"
 
 /* Define to `int' if <sys/types.h> does not define pid_t. */
 #define pid_t int
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 3db012d1..0bccb0bf 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -3,7 +3,7 @@ tmp/
 
 Exiv2 version ------------------------------------------------------------
 ../../src/exiv2
-Exiv2 0.8
+Exiv2 0.9
 Copyright (C) 2004, 2005, 2006 Andreas Huggel.
 
 This program is free software; you can redistribute it and/or