diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bb8959f..b3e617db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ if (WIN32)
 endif (WIN32)
 
 SET(TAGLIB_LIB_MAJOR_VERSION "1")
-SET(TAGLIB_LIB_MINOR_VERSION "5")
+SET(TAGLIB_LIB_MINOR_VERSION "6")
 SET(TAGLIB_LIB_PATCH_VERSION "0")
 
 SET(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}")
@@ -64,5 +64,3 @@ if(NOT WIN32)
 endif(NOT WIN32)
 
 INSTALL( PROGRAMS  ${CMAKE_CURRENT_BINARY_DIR}/taglib-config DESTINATION ${BIN_INSTALL_DIR})
-
-
diff --git a/Makefile.am b/Makefile.am
index f454f7ef..b7f37d78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ apidox:
 	fi; \
 	cp $(top_srcdir)/admin/Doxyfile.global taglib.doxyfile; \
 	echo "PROJECT_NAME        = TagLib" >> taglib.doxyfile; \
-	echo "PROJECT_NUMBER      = \"Version 1.5\"" >> taglib.doxyfile; \
+	echo "PROJECT_NUMBER      = \"Version 1.6\"" >> taglib.doxyfile; \
 	echo "INPUT               = $(srcdir)" >> taglib.doxyfile; \
 	echo "OUTPUT_DIRECTORY    = doc/api" >> taglib.doxyfile; \
 	echo "HTML_OUTPUT         = html" >> taglib.doxyfile; \
diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
index d8dc1909..dfc6721f 100644
--- a/bindings/c/CMakeLists.txt
+++ b/bindings/c/CMakeLists.txt
@@ -55,4 +55,3 @@ INSTALL(TARGETS tag_c
 
 INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 INSTALL( FILES  tag_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
-
diff --git a/bindings/c/taglib_c.pc.in b/bindings/c/taglib_c.pc.in
index 01c63a6b..ae5445f6 100644
--- a/bindings/c/taglib_c.pc.in
+++ b/bindings/c/taglib_c.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: TagLib C Bindings
 Description: Audio meta-data library (C bindings)
 Requires: taglib
-Version: 1.5
+Version: 1.6
 Libs: -L${libdir} -ltag_c
 Cflags: -I${includedir}/taglib 
diff --git a/doc/api-header.html b/doc/api-header.html
index 91e7dc52..d5963f42 100644
--- a/doc/api-header.html
+++ b/doc/api-header.html
@@ -17,7 +17,7 @@
             <td>
               <div id="intro">
                 <table border="0" height="119" cellpadding="0" cellspacing="0" width="100%">
-                    <tr><td valign="top"><h1>TagLib 1.5 ($title)</h1></td></tr>
+                    <tr><td valign="top"><h1>TagLib 1.6 ($title)</h1></td></tr>
                     <tr>
                       <td valign="bottom">
                         <div id="links">
diff --git a/taglib-config.cmake b/taglib-config.cmake
index 9dc5ed1d..925a5ed5 100644
--- a/taglib-config.cmake
+++ b/taglib-config.cmake
@@ -35,7 +35,7 @@ do
 	  flags="$flags -I$includedir/taglib"
 	  ;;
     --version)
-	  echo 1.5
+	  echo 1.6
 	  ;;
     --prefix)
 	  echo $prefix
diff --git a/taglib-config.in b/taglib-config.in
index 10b97795..2a3aeb28 100644
--- a/taglib-config.in
+++ b/taglib-config.in
@@ -35,7 +35,7 @@ do
 	  flags="$flags -I$includedir/taglib"
 	  ;;
     --version)
-	  echo 1.5
+	  echo 1.6
 	  ;;
     --prefix)
 	  echo $prefix
diff --git a/taglib.pc.in b/taglib.pc.in
index 93d0a414..0ff40e39 100644
--- a/taglib.pc.in
+++ b/taglib.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: TagLib
 Description: Audio meta-data library
 Requires: 
-Version: 1.5
+Version: 1.6
 Libs: -L${libdir} -ltag
 Cflags: -I${includedir}/taglib 
diff --git a/taglib/Makefile.am b/taglib/Makefile.am
index 38f9d70e..b075e725 100644
--- a/taglib/Makefile.am
+++ b/taglib/Makefile.am
@@ -26,7 +26,25 @@ libtag_la_SOURCES = tag.cpp tagunion.cpp fileref.cpp audioproperties.cpp
 taglib_include_HEADERS = tag.h fileref.h audioproperties.h taglib_export.h
 taglib_includedir = $(includedir)/taglib
 
-libtag_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 6:0:5
+# Here are a set of rules to help you update your library version information:
+#  Scheme: current:revsion:age
+#  1. Start with version information of `0:0:0' for each libtool library.
+#  2. Update the version information only immediately before a public release 
+#     of your software. More frequent updates are unnecessary, and only 
+#     guarantee that the current interface number gets larger faster.
+#  3. If the library source code has changed at all since the last update, 
+#     then increment revision (`c:r:a' becomes `c:r+1:a').
+#  4. If any interfaces have been added, removed, or changed since the last 
+#     update, increment current, and set revision to 0.
+#  5. If any interfaces have been added since the last public release, then 
+#     increment age.
+#  6. If any interfaces have been removed since the last public release, then 
+#     set age to 0. 
+#  Version history:
+#  6:0:5 -- TagLib 1.5
+#  7:0:6 -- TagLib 1.6
+
+libtag_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 7:0:6
 libtag_la_LIBADD = ./mpeg/libmpeg.la ./ogg/libogg.la ./flac/libflac.la ./mpc/libmpc.la \
 	./ape/libape.la ./toolkit/libtoolkit.la ./wavpack/libwavpack.la \
 	./trueaudio/libtrueaudio.la ./riff/libriff.la \
diff --git a/taglib/taglib.pro b/taglib/taglib.pro
index a98727d9..1b56738c 100644
--- a/taglib/taglib.pro
+++ b/taglib/taglib.pro
@@ -9,7 +9,7 @@ CONFIG -= qt
 DEFINES += HAVE_ZLIB=1 NDEBUG
 LIBS += -lz
 TARGET = TagLib
-VERSION = 1.5
+VERSION = 1.6
 DEPENDPATH += . \
               ape \
               flac \
diff --git a/taglib/toolkit/taglib.h b/taglib/toolkit/taglib.h
index 43d73a4b..a2fa5aff 100644
--- a/taglib/toolkit/taglib.h
+++ b/taglib/toolkit/taglib.h
@@ -27,7 +27,7 @@
 #define TAGLIB_H
 
 #define TAGLIB_MAJOR_VERSION 1
-#define TAGLIB_MINOR_VERSION 5
+#define TAGLIB_MINOR_VERSION 6
 #define TAGLIB_PATCH_VERSION 0
 
 #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1))
@@ -96,8 +96,8 @@ namespace TagLib {
  * Features:
  * - A clean, high level, C++ API to handling audio meta data.
  * - Format specific APIs for advanced API users.
- * - ID3v1, ID3v2, APE, FLAC and Xiph tag formats.
- * - MP3, MPC, FLAC, Ogg FLAC, Ogg Vorbis and Speex file formats.
+ * - ID3v1, ID3v2, APE, FLAC, Xiph, iTunes-style MP4 and WMA tag formats.
+ * - MP3, MPC, FLAC, MP4, ASF, AIFF, WAV, TrueAudio, WavPack, Ogg FLAC, Ogg Vorbis and Speex file formats.
  * - Basic audio file properties such as length, sample rate, etc.
  * - Long term binary and source compatibility.
  * - Extensible design, notably the ability to add other formats or extend current formats as a library user.