diff --git a/CHANGES b/CHANGES
index d7dfcbce77..4f11df8855 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.30
 
+  *) FreeBSD: Disable IPv4-mapped listening sockets by default for versions
+     5+ instead of just for FreeBSD 5. PR 53824.  [Jeff Trawick,
+     Olli Hauer <ohauer gmx de>]
+
   *) mod_proxy: use the original (non absolute) form of the request-line's URI
      for requests embedded in CONNECT payloads used to connect SSL backends via
      a ProxyRemote forward-proxy.  PR 55892.  [Hendrik Harms <hendrik.harms
diff --git a/STATUS b/STATUS
index f212aa1dae..a443251632 100644
--- a/STATUS
+++ b/STATUS
@@ -101,15 +101,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * FreeBSD: Disable IPv4-mapped listening sockets by default for versions
-    5+ instead of just for FreeBSD 5.
-    trunk patch: http://svn.apache.org/r1551685
-                 http://svn.apache.org/r1652929
-    2.4.x patch: http://svn.apache.org/r1570322
-                 http://svn.apache.org/r1653962
-    2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-freesbd_v4mapped.patch
-    +1: ylavic, trawick, rjung
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/configure.in b/configure.in
index cc6ca13e40..8d28ae8fd2 100644
--- a/configure.in
+++ b/configure.in
@@ -480,7 +480,10 @@ AC_ARG_ENABLE(v4-mapped,APACHE_HELP_STRING(--enable-v4-mapped,Allow IPv6 sockets
 ],
 [
     case $host in
-    *freebsd5*|*netbsd*|*openbsd*)
+    *freebsd[[1234]].*)
+        v4mapped=yes
+        ;;
+    *freebsd*|*netbsd*|*openbsd*)
         v4mapped=no
         ;;
     *mingw*)