diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9e78a49cd1..1f3dc15b49 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2015-04-01  Tejas Belagod  <tejas.belagod@arm.com>
 	    Marcus Shawcroft  <marcus.shawcroft@arm.com>
 	    Jiong Wang  <jiong.wang@arm.com>
diff --git a/bfd/configure b/bfd/configure
index 4f0bdd82b9..be53faf8ef 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -13857,8 +13857,8 @@ _ACEOF
 # This is used only by compress.c.
 
   # Use the system's zlib library.
-  zlibdir=-L../zlib
-  zlibinc="-I\$(srcdir)/../zlib"
+  zlibdir="-L\$(top_builddir)/../zlib"
+  zlibinc="-I\$(top_srcdir)/../zlib"
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 3c71c70bb6..023bd981c8 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2015-04-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* MAINTAINERS: Update my e-mail address.
diff --git a/binutils/configure b/binutils/configure
index c5e424e6c5..5db82d79f6 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -13543,8 +13543,8 @@ _ACEOF
 # reading compressed sections).
 
   # Use the system's zlib library.
-  zlibdir=-L../zlib
-  zlibinc="-I\$(srcdir)/../zlib"
+  zlibdir="-L\$(top_builddir)/../zlib"
+  zlibinc="-I\$(top_srcdir)/../zlib"
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2fa231320f..1cdc6f16d4 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2015-04-01  Evandro Menezes  <e.menezes@samsung.com>
 
 	* config/tc-aarch64.c: Add support for Samsung Exynos M1.
diff --git a/gas/configure b/gas/configure
index 67cf1dcde8..cb33d03d7b 100755
--- a/gas/configure
+++ b/gas/configure
@@ -14324,8 +14324,8 @@ esac
 # Link in zlib if we can.  This allows us to write compressed debug sections.
 
   # Use the system's zlib library.
-  zlibdir=-L../zlib
-  zlibinc="-I\$(srcdir)/../zlib"
+  zlibdir="-L\$(top_builddir)/../zlib"
+  zlibinc="-I\$(top_srcdir)/../zlib"
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 079a3071aa..73108a1f63 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.in (top_srcdir): New.
+	* configure: Regenerated.
+
 2015-04-02  Gary Benson <gbenson@redhat.com>
 
 	* NEWS: Announce the new default sysroot of "target:".
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8f43617317..87645cdb45 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -105,6 +105,7 @@ POSTCOMPILE = @true
 # Directory containing source files.
 srcdir = @srcdir@
 VPATH = @srcdir@
+top_srcdir = @top_srcdir@
 
 YACC=@YACC@
 
diff --git a/gdb/configure b/gdb/configure
index 3e031a5905..b8d4a7a194 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -7020,8 +7020,8 @@ fi
 # Link in zlib if we can.  This allows us to read compressed debug sections.
 
   # Use the system's zlib library.
-  zlibdir=-L../zlib
-  zlibinc="-I\$(srcdir)/../zlib"
+  zlibdir="-L\$(top_builddir)/../zlib"
+  zlibinc="-I\$(top_srcdir)/../zlib"
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 6a8435553a..ea4390eeb8 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
 2015-04-01  Ilya Tocar  <ilya.tocar@intel.com>
 
 	PR gold/17640
diff --git a/gold/configure b/gold/configure
index d082ffe70f..a005a757ec 100755
--- a/gold/configure
+++ b/gold/configure
@@ -6876,8 +6876,8 @@ fi
 # Link in zlib if we can.  This allows us to write compressed sections.
 
   # Use the system's zlib library.
-  zlibdir=-L../zlib
-  zlibinc="-I\$(srcdir)/../zlib"
+  zlibdir="-L\$(top_builddir)/../zlib"
+  zlibinc="-I\$(top_srcdir)/../zlib"
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :