diff --git a/ChangeLog b/ChangeLog
index 5c5a511..ae12eb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,85 @@
 
+***
+*** Version 1.6.0 ***
+***
+
+Alexander Volkov (1):
+      Allow to use custom memory management functions for loaded images
+
+Kim Woelders (64):
+      Add __imlib_LoadImageWrapper() handling all load() calls
+      imlib2_conv: Report error on save failure
+      Autofoo cosmetics
+      Trivial cleanups in imlib2_... test programs
+      Add imlib2_test_load program
+      Cleanups in load() functions
+      Centralize handling of im->format
+      Sort loaders in Makefile.am
+      Remove obsolete dmalloc stuff
+      Move SWAP.. macro definitions to common.h
+      Use common PIXEL_ARGB() macro to compose pixels
+      Add new ICO loader
+      Spec file simlifications and cleanups
+      Fix memory leak in imlib_list_fonts()
+      XPM loader: Refactor exit cleanup handling
+      XPM loader: Fix potentially uninitialized pixel data
+      XPM loader: Fixup after "Refactor exit cleanup handling"
+      Revert "XPM loader: Fix potentially uninitialized pixel data"
+      XPM loader: Cosmetics (reduce indent level)
+      XPM loader: Fix several colormap issues
+      XPM loader: Simplify pixel value handling
+      XPM loader: Add missing pixels (malformed xpm)
+      XPM loader: More simplifications
+      JPG loader: Refactor
+      JPG loader: Do proper CMYK conversion
+      Add new WebP loader
+      Remove pointless im->data checks in loaders
+      WepP loader: Fix memory leak in error path
+      JPG loader: Fix memory leaks in error paths
+      Fix ABI break
+      ICO loader: Add binary flag to fopen()
+      JPG loader: Refactor error handling
+      Rename/add byte swap macros
+      BMP loader: Major makeover - numerous bug fixes and feature enhancements
+      Miscellaneous imlib_test_load tweaks
+      GZIP loader: Check filename before uncompress
+      imlib2_test_load: Fixup after recent change
+      Re-indent everything using indent-2.2.12
+      TGA loader: Refactor
+      Eliminate WRITE_RGBA()
+      Simplify autogen.sh
+      Simplify pixel color handling in api.c
+      Use pixel instead of r,b,g,a in __imlib_render_str()
+      Use macro for pixel color access in savers
+      Eliminate READ_RGBA()
+      XPM loader: Accept signature not at the very start of the file
+      Simplify loader lookup functions
+      imlib2_view: Enable selecting next/prev using keys too
+      imlib2_view: Fix event processing bug
+      imlib2_test_load: Fixup recent breakage for real
+      imlib2_test_load: Check progress conditionally
+      imlib2_view: Add verbose option, quit on Escape too
+      TGA loader - Mostly cosmetic refactoring
+      TGA loader: More mostly cosmetic changes
+      TGA loader: Support horiontal flip
+      TGA loader: Add simple 16 bpp handling
+      TGA loader: Tweak error handling
+      ICO loader: Fix non-immediate loading
+      Remove __imlib_AllocateData() w,h args
+      imlib2_view: Fix next/prev selection if last/first image is bad
+      ICO loader: Fix memory leak in error path
+      XPM loader: Correct signature check (avoid accessing unset data)
+      gz, bz2 loaders: Simplify, eliminate unnecessary strdups, cosmetics
+      Bump minor version (new functions)
+
+Olof-Joachim Frahm (欧雅福) (2):
+      Check filename before opening archive file.
+      tga loader: implement handling of palette
+
+Ralph Siemsen (1):
+      loader_tga: fix regression in RLE raw byte handling
+
+
 ***
 *** Version 1.5.1 ***
 ***
diff --git a/configure.ac b/configure.ac
index f00c750..93044d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # get rid of that stupid cache mechanism
 rm -f config.cache
 
-AC_INIT([imlib2], [1.5.1], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([imlib2], [1.6.0], [enlightenment-devel@lists.sourceforge.net])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_BUILD
@@ -22,9 +22,9 @@ define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
 define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
 LT_INIT
 
-VERSION_CUR=6
-VERSION_REV=1
-VERSION_AGE=5
+VERSION_CUR=7
+VERSION_REV=0
+VERSION_AGE=6
 lt_version=${VERSION_CUR}:${VERSION_REV}:${VERSION_AGE}
 AC_SUBST(lt_version)