diff --git a/config/configure.ac b/config/configure.ac
index 7fb171ee..2cd37dba 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -3,8 +3,8 @@
 
 AC_PREREQ(2.61)
 AC_INIT(exiv2, 0.17.91, ahuggel@gmx.net)
-# See http://www.gnu.org/software/libtool/manual.html#Updating-version-info
-EXIV2_LTVERSION=4:1:0
+# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+EXIV2_LTVERSION=5:0:0
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 3e1b10a6..9994999a 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,33 @@
+Changes from version 0.17.1 to 0.18-pre1
+----------------------------------------
+
+* Exiv2 library
+	- 0000568: [metadata] exiv2 -ps crash for some jpeg files. (Reported by
+	           aurelien)
+	- 0000566: [miscellaneous] RSA licensed MD5.cpp file in exiv2 0.16.
+	           (Reported with fix by Dirk Mueller)
+	- 0000565: [exif] IFDs and IFD offsets need to be aligned to word
+	           boundaries. (Reported by iplabs.de)
+	- 0000554: [exif] Setting "Exif.Image.DateTime Date" gives "Value too
+	           large" exception. (Debian Bug #426274)
+	- 0000553: [design] [U]Rational::toLong() and toFloat() should not divide
+	           by 0.
+	- 0000528: [miscellaneous] typeSize is meant for Exif metadata only.
+	- 0000526: [metadata] Adding GPS info removes preview image from Nikon
+	           Coolpix JPGs. (Reported by paulb)
+	- 0000524: [design] Publish only API objects in the installed header files.
+	- 0000523: [miscellaneous] C++ symbol visibility support for gcc builds.
+	- 0000464: [metadata] Write support for PNG images. (Gilles Caulier)
+	- 0000462: [exif] Write support for TIFF format ("New TIFF parser").
+	- 0000405: [design] Separate metadata parsing from metadata storage.
+	-          [metadata] Write support for JPEG2000 format.
+	-          [exif] Updated Nikon lens info to v3.25 of Robert Rottmerhusen's
+	           lens database.
+	-          [xmp] Added Microsoft Photo and digiKam XMP schemas.
+	           (Gilles Caulier)
+	-          [exif] Added DNG tags.
+
+
 Changes from version 0.17 to 0.17.1
 -----------------------------------