diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 10ea6fc5fa1..5d3013a885f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2015-03-31  Ed Schouten  <ed@nuxi.nl>
 
 	* config.bfd (targ_defvec): Set to x86_64_elf64_cloudabi_vec
diff --git a/bfd/configure b/bfd/configure
index 777d74abdef..4f0bdd82b9c 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -13862,8 +13862,10 @@ _ACEOF
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
-  withval=$with_system_zlib; zlibdir=
-  zlibinc=
+  withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then
+    zlibdir=
+    zlibinc=
+  fi
 
 fi
 
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index bd3890c5b9c..e369f6bdb1f 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2015-03-31  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* configure.ac: Revert the AM_ZLIB change.
diff --git a/binutils/configure b/binutils/configure
index 0fc173bae91..c5e424e6c50 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -13548,8 +13548,10 @@ _ACEOF
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
-  withval=$with_system_zlib; zlibdir=
-  zlibinc=
+  withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then
+    zlibdir=
+    zlibinc=
+  fi
 
 fi
 
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7052c62ed36..0c1f815bd22 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2015-03-31  Ed Schouten  <ed@nuxi.nl>
 
 	* configure.tgt (fmt): Set to elf for *-*-cloudabi*.
diff --git a/gas/configure b/gas/configure
index 002891d6ed2..67cf1dcde83 100755
--- a/gas/configure
+++ b/gas/configure
@@ -14329,8 +14329,10 @@ esac
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
-  withval=$with_system_zlib; zlibdir=
-  zlibinc=
+  withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then
+    zlibdir=
+    zlibinc=
+  fi
 
 fi
 
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0416305f40a..88e4a0caace 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2015-03-31  Sergio Durigan Junior  <sergiodj@redhat.com>
 	    Jan Kratochvil  <jan.kratochvil@redhat.com>
 	    Oleg Nesterov  <oleg@redhat.com>
diff --git a/gdb/configure b/gdb/configure
index d3d093d1e3f..3e031a5905c 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -7025,8 +7025,10 @@ fi
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
-  withval=$with_system_zlib; zlibdir=
-  zlibinc=
+  withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then
+    zlibdir=
+    zlibinc=
+  fi
 
 fi