diff --git a/config/ChangeLog b/config/ChangeLog
index 6dc499891f..6ffb0ed1e6 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* zlib.m4 (AM_ZLIB): Set zlibdir to -L\$(top_builddir)/../zlib
+	and set zlibinc to -I\$(top_srcdir)/../zlib.
+
 2015-04-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* zlib.m4 (AM_ZLIB): Unset zlibdir and zlibinc only for
diff --git a/config/zlib.m4 b/config/zlib.m4
index aa3ac48692..afa57d112e 100644
--- a/config/zlib.m4
+++ b/config/zlib.m4
@@ -5,8 +5,8 @@ dnl --with-system-zlib.
 AC_DEFUN([AM_ZLIB],
 [
   # Use the system's zlib library.
-  zlibdir=-L../zlib
-  zlibinc="-I\$(srcdir)/../zlib"
+  zlibdir="-L\$(top_builddir)/../zlib"
+  zlibinc="-I\$(top_srcdir)/../zlib"
   AC_ARG_WITH(system-zlib,
   [AS_HELP_STRING([--with-system-zlib], [use installed libz])],
   if test x$with_system_zlib = xyes ; then