diff --git a/postgresql12.changes b/postgresql12.changes
index d431108..e21ec64 100644
--- a/postgresql12.changes
+++ b/postgresql12.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 26 11:48:38 UTC 2023 - Reinhard Max <max@suse.com>
+
+- Restore the independence of mini builds from the main build after
+  the -mini name change from April 4, 2023.
+- Adjust icu handling to prepare for PostgreSQL 16.
+
 -------------------------------------------------------------------
 Mon May 15 14:22:59 UTC 2023 - Reinhard Max <max@suse.com>
 
diff --git a/postgresql12.spec b/postgresql12.spec
index ad57b08..a46dec1 100644
--- a/postgresql12.spec
+++ b/postgresql12.spec
@@ -69,7 +69,11 @@ Name:           %pgname
 
 %if %mini
 %bcond_with  selinux
+%if %pgmajor >= 16
+%bcond_without icu
+%else
 %bcond_with  icu
+%endif
 %else
 BuildRequires:  %{python}-devel
 BuildRequires:  docbook_4
@@ -143,11 +147,18 @@ BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(krb5)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(systemd)
-#!BuildIgnore:  postgresql-implementation
-#!BuildIgnore:  postgresql-server-implementation
-#!BuildIgnore:  postgresql-devel-noarch
-#!BuildIgnore:  postgresql-llvmjit-devel-noarch
-#!BuildIgnore:  postgresql-server-devel-noarch
+#!BuildIgnore:  %pgname
+#!BuildIgnore:  %pgname-server
+#!BuildIgnore:  %pgname-devel
+#!BuildIgnore:  %pgname-server-devel
+#!BuildIgnore:  %pgname-llvmjit
+#!BuildIgnore:  %pgname-llvmjit-devel
+#!BuildIgnore:  %pgname-contrib
+#!BuildIgnore:  %pgname-docs
+#!BuildIgnore:  %pgname-test
+#!BuildIgnore:  %pgname-pltcl
+#!BuildIgnore:  %pgname-plperl
+#!BuildIgnore:  %pgname-plpython
 Summary:        Basic Clients and Utilities for PostgreSQL
 License:        PostgreSQL
 Group:          Productivity/Databases/Tools