diff --git a/ChangeLog b/ChangeLog
index f4a1425..88fd5cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,32 @@
+2024-07-09 22:15  mywave82
+
+	* ChangeLog: Release 1.6
+
+2024-02-05 10:36  mnhauke
+
+	* When compiling shared library with mingw, LD needs parameter "-no-undefined"
+
+2023-10-07 00:22  mywave82
+
+	* Put m4 macro files inside m4 directory when possible
+	* Enable maintainer-mode by default in ./configure.
+	* `autoupdate` to update deprecated macros in configure.ac
+
+2022-04-30 21:29  mywave82
+
+	* Fix some compiler warnings (g++ version 11.2.0 used for testing)
+
+2020-11-17 02:32  miller-alex
+	* Don't convert string constants to char *
+	* Remove useless const on binio::detect_system_flags() return type
+
+2020-07-25 24:08  cxong
+
+	* Add CMake files
+
 2019-08-07 15:58  malvineous
+
+	* ChangeLog: Release 1.5
 	* Fix off-by-one error in memory stream.
 	* Move from SourceForge to GitHub.
 	* Documentation updates and support for more build environments.
diff --git a/Makefile.bt b/Makefile.bt
index ea264e4..fa85bcc 100644
--- a/Makefile.bt
+++ b/Makefile.bt
@@ -7,6 +7,6 @@ AUX = doc\*.texi README AUTHORS NEWS COPYING TODO ChangeLog
 DIST = src\*.cpp src\*.h src\binio.h.in src\Makefile.bt $(AUX) INSTALL
 BINARYDIST = src\*.h src\binio.lib $(AUX)
 
-distfile = binio13s.zip
-binarydistfile = binio13.zip
+distfile = binio16s.zip
+binarydistfile = binio16.zip
 installfile = INSTALL.dos
diff --git a/NEWS b/NEWS
index 1546c78..026fc84 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 This is a brief overview of user-visible changes in libbinio.
 
+Changes for version 1.6:
+------------------------
+- Updates in autoconf files
+- Added initial support for CMake
+- Fix various warnings in the code
+- Fix building shared library with mingw
+
 Changes for version 1.5:
 ------------------------
 - Fix off-by-one error in memory streams.
diff --git a/appveyor.yml b/appveyor.yml
index 9ab1aa3..25b4f18 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.5.{build}
+version: 1.6.{build}
 image: Visual Studio 2017
 
 install:
diff --git a/binio.spec b/binio.spec
index 206cc63..5158369 100644
--- a/binio.spec
+++ b/binio.spec
@@ -1,5 +1,5 @@
 %define name binio
-%define version 1.5
+%define version 1.6
 %define release 1
 
 Summary: Binary I/O stream class library
diff --git a/binio_mdk.spec b/binio_mdk.spec
index 0ee1639..b286977 100644
--- a/binio_mdk.spec
+++ b/binio_mdk.spec
@@ -1,5 +1,5 @@
 %define name binio
-%define version 1.4
+%define version 1.6
 %define release 1mdk
 %define libname %mklibname %name 1
 
diff --git a/configure.ac b/configure.ac
index 00e12e1..5e322d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,7 @@
-AC_INIT([binio],[1.5],[dn.tlp@gmx.net],[libbinio])
+AC_INIT([binio],[1.6],[dn.tlp@gmx.net],[libbinio])
+# Version used for SO/DLL file(s). See https://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
+AC_SUBST([VERSION_INFO],"1:0:0")
+
 AC_CONFIG_SRCDIR(src/binio.cpp)
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile src/binio.h libbinio.pc])
 AC_CONFIG_MACRO_DIRS([m4])
diff --git a/libbinio.qpg b/libbinio.qpg
index 888858e..b5493ea 100644
--- a/libbinio.qpg
+++ b/libbinio.qpg
@@ -75,7 +75,7 @@
                <QPM:ProductDescriptionEmbedURL/>
             </QPM:ProductDescription>
             <QPM:ReleaseDescription>
-               <QPM:ReleaseVersion>1.5</QPM:ReleaseVersion>
+               <QPM:ReleaseVersion>1.6</QPM:ReleaseVersion>
                <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
                <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
                <QPM:ReleaseNoteMinor/>
diff --git a/src/Makefile.am b/src/Makefile.am
index a8cca18..92249df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libbinio.la
 
 libbinio_la_SOURCES = binio.cpp binfile.cpp binwrap.cpp binstr.cpp
 
-libbinio_la_LDFLAGS = -version-info 1:0:0
+libbinio_la_LDFLAGS = -version-info @VERSION_INFO@
 libbinio_la_LDFLAGS += -no-undefined # mingw requires this when making shared DLL files
 
 pkginclude_HEADERS = binio.h binfile.h binwrap.h binstr.h