diff --git a/config/acx_pthread.m4 b/config/acx_pthread.m4
index 8b3915865e4b1e60cc72c36ca392081497a5718a..2ca565c14407750a471366ffd191be84781d02a0 100644
--- a/config/acx_pthread.m4
+++ b/config/acx_pthread.m4
@@ -202,9 +202,9 @@ if test "x$acx_pthread_ok" = xyes; then
         LIBS="$save_LIBS"
         CFLAGS="$save_CFLAGS"
 
-# Not a common AIX compiler so we don't support it and adding a specific
-# compiler usage for every thread compile is ugly
-# AIX threading requires gcc
+# Supporting cc_r would require a special CC in all places that
+# use libpq, and that is ugly, so we don't do it.  Users can still
+# define their compiler as cc_r to do thread builds of everything.
         # More AIX lossage: must compile with cc_r
         AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC})
 else
diff --git a/configure b/configure
index 4c99f9002cdf1ebf34e3fe8eb77aea45b4ae51b2..0d7a0eb197770193182712d5aeb9525211005c64 100755
--- a/configure
+++ b/configure
@@ -14236,9 +14236,9 @@ echo "${ECHO_T}${flag}" >&6
         LIBS="$save_LIBS"
         CFLAGS="$save_CFLAGS"
 
-# Not a common AIX compiler so we don't support it and adding a specific
-# compiler usage for every thread compile is ugly
-# AIX threading requires gcc
+# Supporting cc_r would require a special CC in all places that
+# use libpq, and that is ugly, so we don't do it.  Users can still
+# define their compiler as cc_r to do thread builds of everything.
         # More AIX lossage: must compile with cc_r
         # Extract the first word of "cc_r", so it can be a program name with args.
 set dummy cc_r; ac_word=$2