diff --git a/configure.ac b/configure.ac
index 5299cd66b4e..f73bb41ac09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2006-2022 Cisco Systems, Inc.  All rights reserved
+# Copyright (c) 2006-2023 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2006-2008 Sun Microsystems, Inc.  All rights reserved.
 # Copyright (c) 2006-2017 Los Alamos National Security, LLC.  All rights
 #                         reserved.
@@ -458,6 +458,10 @@ AC_CHECK_SIZEOF(double _Complex)
 AC_CHECK_SIZEOF(long double _Complex)
 
 AC_CHECK_SIZEOF(void *)
+AS_IF([test "$ac_cv_sizeof_void_p" -eq 4],
+      [AC_MSG_WARN([Open MPI no longer supports 32 bit builds.])
+       AC_MSG_WARN([Please use Open MPI v4.x or earlier if you need 32 bit support.])
+       AC_MSG_ERROR([Cannot continue])])
 AC_CHECK_SIZEOF(size_t)
 if test "$ac_cv_type_ssize_t" = yes ; then
     AC_CHECK_SIZEOF(ssize_t)
diff --git a/docs/faq/supported-systems.rst b/docs/faq/supported-systems.rst
index 039fbdfc9ac..423af298e0b 100644
--- a/docs/faq/supported-systems.rst
+++ b/docs/faq/supported-systems.rst
@@ -153,19 +153,6 @@ releases continually improve reliability and performance of
 multi-threaded MPI applications.
 
 
-/////////////////////////////////////////////////////////////////////////
-
-Does Open MPI support 32 bit environments?
-------------------------------------------
-
-As far as we know, yes.  64 bit architectures have effectively taken
-over the world, though, so 32-bit is not tested nearly as much as
-64-bit.
-
-Specifically, most of the Open MPI developers only have 64-bit
-machines, and therefore only test 32-bit in emulation mode.
-
-
 /////////////////////////////////////////////////////////////////////////
 
 Does Open MPI support 64 bit environments?
diff --git a/docs/release-notes/platform.rst b/docs/release-notes/platform.rst
index 18b48b24eb0..5616ead888a 100644
--- a/docs/release-notes/platform.rst
+++ b/docs/release-notes/platform.rst
@@ -22,8 +22,7 @@ Platform Notes
 
 * Other systems have been lightly (but not fully) tested:
 
-  * Linux (various flavors/distros), 32 bit, with gcc
-  * Cygwin 32 & 64 bit with gcc
+  * Cygwin 64 bit with gcc
   * ARMv6, ARMv7, ARMv9
   * Other 64 bit platforms.
   * OpenBSD.  Requires configure options ``--enable-mca-no-build=patcher``
@@ -32,6 +31,8 @@ Platform Notes
     using the clang-4.0 system compiler. A workaround is to build
     Open MPI using the GNU compiler.
 
+.. note:: 32-bit environments are no longer supported.
+
 * The run-time systems that are currently supported are:
 
   * ssh / rsh