diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 219d437622f..cd25151f86a 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -3,6 +3,14 @@
 	Revert
 	2012-02-24  Dave Korn  <dave.korn.cygwin@gmail.com>
 
+	* gcc-interface/Makefile.in (WIN_SO_PREFIX [windows targets]): New
+	Windows-specific make variable.
+	(WIN_SO_INSTALL_DIR [windows targets]): Likewise.
+	(install-gnatlib): Respect the above during installation when set,
+	and also install any windows import library that has been built.
+	(gnatlib-shared-win32): Use WIN_SO_PREFIX to name output DLL and also
+	build a corresponding import library.
+
 2012-04-30  Jan Hubicka  <jh@suse.cz>
 
 	* gcc-interface/utils.c (rest_of_subprog_body_compilation): Update
diff --git a/libada/ChangeLog b/libada/ChangeLog
index 9d1c0a7fffc..787b9382b77 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,12 +1,3 @@
-2012-05-02  Pascal Obry  <obry@adacore.com>
-
-	Revert
-	2012-02-24  Dave Korn  <dave.korn.cygwin@gmail.com>
-
-2012-02-24  Dave Korn  <dave.korn.cygwin@gmail.com>
-
-	* Makefile.in (bindir): Import from autoconf and pass down to submake.
-
 2012-01-22  Douglas B Rupp  <rupp@gnat.com>
 
 	* configure: Regenerate.