diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e0fef992067c7346f2b4fbd0ac039b7ed09f7ee9..3f99bb3c3220e78214aa323d689dd9aef1d5727a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-29  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	* config/i386/cygwin.h (LIBGCJ_SONAME): Set libgcj version to -16.
+	* config/i386/mingw32.h (LIBGCJ_SONAME): Set libgcj version to -16.
+
 2015-01-28  Oleg Endo  <olegendo@gcc.gnu.org>
 
 	PR target/64659
diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
index 37f27a786e5e6613574c3dc6e304495167c92900..a90f513310508bde940a01cba223beeaf16900b3 100644
--- a/gcc/config/i386/cygwin.h
+++ b/gcc/config/i386/cygwin.h
@@ -146,5 +146,5 @@ along with GCC; see the file COPYING3.  If not see
 #define LIBGCC_SONAME "cyggcc_s" LIBGCC_EH_EXTN "-1.dll"
 
 /* We should find a way to not have to update this manually.  */
-#define LIBGCJ_SONAME "cyggcj" /*LIBGCC_EH_EXTN*/ "-15.dll"
+#define LIBGCJ_SONAME "cyggcj" /*LIBGCC_EH_EXTN*/ "-16.dll"
 
diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
index d7b92e88714ec2f6d5f4f0babf58b193beff80ec..ab46ff26d2da17c8ba304fa37f9063c204287c39 100644
--- a/gcc/config/i386/mingw32.h
+++ b/gcc/config/i386/mingw32.h
@@ -246,4 +246,4 @@ do {						         \
 #define LIBGCC_SONAME "libgcc_s" LIBGCC_EH_EXTN "-1.dll"
 
 /* We should find a way to not have to update this manually.  */
-#define LIBGCJ_SONAME "libgcj" /*LIBGCC_EH_EXTN*/ "-13.dll"
+#define LIBGCJ_SONAME "libgcj" /*LIBGCC_EH_EXTN*/ "-16.dll"
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f28f97f3c61c317395984e6b5c9f65c82f163c19..e87dc2f76c1dd235035c92990ce1a1d9523cc9b6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-29  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	* libtool-version: Add a comment about cygwin.
+
 2015-01-21  Matthias Klose  <doko@ubuntu.com>
 
 	* libtool-version: Bump soversion.
diff --git a/libjava/libtool-version b/libjava/libtool-version
index 5f88e38d639f0dee06d055d55b736e715d60823a..52fc31c8e0a299ea9580678651b7cf7ffc60f66f 100644
--- a/libjava/libtool-version
+++ b/libjava/libtool-version
@@ -2,5 +2,7 @@
 # the libtool manual to understand the meaning of the fields.  This is
 # a separate file so that version updates don't involve re-running
 # automake.
+# Note: When changing the version here, please do also update LIBGCJ_SONAME
+# in gcc/config/i386/cygwin.h and gcc/config/i386/mingw32.h.
 # CURRENT:REVISION:AGE
 16:0:0