diff --git a/ChangeLog b/ChangeLog
index 6804fe5d0f1..89eb37a6a4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-11-08  Richard Henderson  <rth@redhat.com>
 
+	* configure.ac: Adjust srcdir for running libitm/configure.tgt.
+
 	* configure.ac: Test libitm/configure.tgt to disable libitm.
 	* configure: Rebuild.
 
diff --git a/configure b/configure
index b9cf0f1d0ff..7a7f2872bf7 100755
--- a/configure
+++ b/configure
@@ -3061,7 +3061,9 @@ fi
 if test x$enable_libitm = x; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libitm support" >&5
 $as_echo_n "checking for libitm support... " >&6; }
-   if (. ${srcdir}/libitm/configure.tgt; test -n "$UNSUPPORTED"); then
+   if (srcdir=${srcdir}/libitm; \
+       . ${srcdir}/configure.tgt; \
+       test -n "$UNSUPPORTED"); then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	noconfigdirs="$noconfigdirs target-libitm"
diff --git a/configure.ac b/configure.ac
index 0a30880ef98..888d0514336 100644
--- a/configure.ac
+++ b/configure.ac
@@ -496,7 +496,9 @@ fi
 # Disable libitm on unsupported hosted systems.
 if test x$enable_libitm = x; then
    AC_MSG_CHECKING([for libitm support])
-   if (. ${srcdir}/libitm/configure.tgt; test -n "$UNSUPPORTED"); then
+   if (srcdir=${srcdir}/libitm; \
+       . ${srcdir}/configure.tgt; \
+       test -n "$UNSUPPORTED"); then
 	AC_MSG_RESULT([no])
 	noconfigdirs="$noconfigdirs target-libitm"
    else
diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index f9624bb8ca0..c8c42795e01 100644
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,5 +1,7 @@
 2011-11-08  Richard Henderson  <rth@redhat.com>
 
+	* configure.tgt: Test correct directory for supported cpus.
+
 	* configure.ac: Exit if unsupported.
 	* configure: Rebuild.
 	* configure.tgt: Delete boilerplate from libgomp for unsupported
diff --git a/libitm/configure.tgt b/libitm/configure.tgt
index dd7c78bd027..eac6f504433 100644
--- a/libitm/configure.tgt
+++ b/libitm/configure.tgt
@@ -77,7 +77,7 @@ case "${target_cpu}" in
 esac
 
 # For the benefit of top-level configure, determine if the cpu is supported.
-test -d ${srcdir}/$ARCH || UNSUPPORTED=1
+test -d ${srcdir}/config/$ARCH || UNSUPPORTED=1
 
 # Since we require POSIX threads, assume a POSIX system by default.
 config_path="$ARCH posix generic"