diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0474038530c91a34d6ddfb11b14413268845de0d..85125572cc5a9b3b5b5a3251809b05dfabe16796 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-27  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* configure.ac: Treat a --with-headers option without argument
+	the same as the default (i.e. consult sys-include directory).
+	* configure: Regenerate.
+
 2016-05-27  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	* config/aarch64/aarch64.c (aarch64_fusion_enabled_p): New function.
diff --git a/gcc/configure b/gcc/configure
index c8d8abcb3a502c58d799ce7664e151ba69b0fa98..9e5cd644b8689b82751bda79e8c1978b31ed6f02 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -12289,7 +12289,7 @@ elif test "x$TARGET_SYSTEM_ROOT" != x; then
 fi
 
 if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
-  if test "x$with_headers" != x; then
+  if test "x$with_headers" != x && test "x$with_headers" != xyes; then
     target_header_dir=$with_headers
   elif test "x$with_sysroot" = x; then
     target_header_dir="${test_exec_prefix}/${target_noncanonical}/sys-include"
diff --git a/gcc/configure.ac b/gcc/configure.ac
index ab91de6e4b11d9343de62526ea45dc1b50e354df..046c94e0a9a850d1ab23dd896cc8f3dad882f243 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -2035,7 +2035,7 @@ elif test "x$TARGET_SYSTEM_ROOT" != x; then
 fi
 
 if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
-  if test "x$with_headers" != x; then
+  if test "x$with_headers" != x && test "x$with_headers" != xyes; then
     target_header_dir=$with_headers
   elif test "x$with_sysroot" = x; then
     target_header_dir="${test_exec_prefix}/${target_noncanonical}/sys-include"