diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index ea94ceaa3f1036870477370f779a9d8bb3513a16..32976762b7eb9457cfe974ac026342fa71c5bdd0 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-14  Steve Ellcey  <sje@cup.hp.com>
+
+	* Makefile.am: Add -I .. to ACLOCAL_AMFLAGS.
+	* Makefile.in: Regenerate.
+
 2007-04-07  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	PR testsuite/31369
diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am
index 6963e105e62cbb6b9ad1bd754c975ea7cc1f9f03..18544c8fec5786d54c010a7d1895466c5ab8af85 100644
--- a/libgomp/Makefile.am
+++ b/libgomp/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I .. -I ../config
 SUBDIRS = testsuite
 
 ## May be used by toolexeclibdir.
diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index f41ca1707f6cb97072202f166e98cc2df902dc0e..bb48aae729a40a1ef7e9c7e25279018b8b9ef982 100644
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -260,7 +260,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 toolexecdir = @toolexecdir@
 toolexeclibdir = @toolexeclibdir@
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I .. -I ../config
 SUBDIRS = testsuite
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir)