diff --git a/baselibs.conf b/baselibs.conf
index bbfdda3..3ca39cd 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -5,15 +5,20 @@ glibc
   targettype x86 obsoletes "baselibs-x86"
   targettype ia32 +/etc/ld.so.conf
   targettype ia32 "/lib/ld-linux.so.2 -> <prefix>/lib/ld-linux.so.2"
+  +/usr/lib(64)?/gconv/gconv-modules
+  targettype x86 -/usr/lib(64)?/gconv/gconv-modules
   prereq -glibc-x86
   +/usr/lib/getconf/[^g]
   +/usr/sbin/iconvconfig -> /usr/sbin/iconvconfig-<extension>
-glibc-locale-base
+  post "/usr/sbin/iconvconfig-<extension>"
+  recommends "glibc-gconv-modules-extra-<targettype> = %version"
+glibc-gconv-modules-extra
   arch i586 block!
   +/usr/lib(64)?/gconv/gconv-modules
   targettype x86 -/usr/lib(64)?/gconv/gconv-modules
-  obsoletes "glibc-locale-<targettype>"
   post "/usr/sbin/iconvconfig-<extension>"
+  postun "/usr/sbin/iconvconfig-<extension>"
+  obsoletes "glibc-locale-base-<targettype>"
 glibc-devel
   requires "glibc-<targettype> = %version"
   arch i586 block!
diff --git a/glibc.changes b/glibc.changes
index ff56302..9c732b9 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 21 09:44:46 UTC 2024 - Andreas Schwab <schwab@suse.de>
+
+- Move essential (Latin-1 and UTF based) gconv modules to main glibc
+  package, other modules to new package glibc-gconv-modules-extra
+
 -------------------------------------------------------------------
 Mon May 13 09:45:36 UTC 2024 - Andreas Schwab <schwab@suse.de>
 
diff --git a/glibc.spec b/glibc.spec
index 9cb9bfd..fbdae2d 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -204,6 +204,7 @@ Provides:       ld-linux.so.3(GLIBC_2.4)
 %endif
 Requires(pre):  filesystem
 Recommends:     glibc-extra
+Recommends:     glibc-gconv-modules-extra
 Provides:       rtld(GNU_HASH)
 %endif
 %if %{build_utils}
@@ -408,7 +409,6 @@ created.
 Summary:        en_US Locale Data for Localized Programs
 License:        GPL-2.0-or-later AND MIT AND LGPL-2.1-or-later
 Group:          System/Libraries
-Requires(post): /bin/cat
 Requires:       glibc = %{version}
 
 %description locale-base
@@ -445,6 +445,17 @@ Obsoletes:      unscd <= 0.48
 Nscd caches name service lookups and can dramatically improve
 performance with NIS, NIS+, and LDAP.
 
+%package gconv-modules-extra
+Summary:        Non-essential gconv modules
+License:        LGPL-2.1-or-later
+Group:          System/Libraries
+Requires:       glibc = %{version}
+Provides:       glibc-locale-base:%{_libdir}/gconv/BIG5.so
+
+%description gconv-modules-extra
+Modules for use by the iconv facility, to support encodings other than
+Latin-1 and UTF based.
+
 %package profile
 Summary:        Libc Profiling and Debugging Versions
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0
@@ -1162,14 +1173,14 @@ if posix.access("%{rootsbindir}/ldconfig", "x") then
   exec("%{rootsbindir}/ldconfig", "-X")
 end
 if posix.utime("%{_libdir}/gconv/gconv-modules.cache") then
-  exec("/usr/sbin/iconvconfig", "-o", "%{_libdir}/gconv/gconv-modules.cache",
+  exec("%{_sbindir}/iconvconfig", "-o", "%{_libdir}/gconv/gconv-modules.cache",
        "--nostdlib", "%{_libdir}/gconv")
 end
 
 %postun -p %{rootsbindir}/ldconfig
 
-%post locale-base
-/usr/sbin/iconvconfig
+%post gconv-modules-extra -p %{_sbindir}/iconvconfig
+%postun gconv-modules-extra -p %{_sbindir}/iconvconfig
 
 %post info
 %install_info --info-dir=%{_infodir} %{_infodir}/libc.info.gz
@@ -1265,6 +1276,46 @@ exit 0
 %dir %attr(0755,root,root) %{_libexecdir}/getconf
 %{_libexecdir}/getconf/*
 %{_sbindir}/iconvconfig
+%dir %{_libdir}/gconv
+%{_libdir}/gconv/ANSI_X3.110.so
+%{_libdir}/gconv/CP1252.so
+%{_libdir}/gconv/ISO8859-1.so
+%{_libdir}/gconv/ISO8859-15.so
+%{_libdir}/gconv/UNICODE.so
+%{_libdir}/gconv/UTF-16.so
+%{_libdir}/gconv/UTF-32.so
+%{_libdir}/gconv/UTF-7.so
+%{_libdir}/gconv/gconv-modules
+%dir %{_libdir}/gconv/gconv-modules.d
+%ifarch s390x
+%{_libdir}/gconv/gconv-modules.d/gconv-modules-s390.conf
+%{_libdir}/gconv/ISO-8859-1_CP037_Z900.so
+%{_libdir}/gconv/UTF8_UTF32_Z9.so
+%{_libdir}/gconv/UTF16_UTF32_Z9.so
+%{_libdir}/gconv/UTF8_UTF16_Z9.so
+%endif
+%attr(0644,root,root) %verify(not md5 size mtime) %ghost %{_libdir}/gconv/gconv-modules.cache
+
+%files gconv-modules-extra
+%dir %{_libdir}/gconv
+%dir %{_libdir}/gconv/gconv-modules.d
+%{_libdir}/gconv/gconv-modules.d/*.conf
+%{_libdir}/gconv/*.so
+%exclude %{_libdir}/gconv/ANSI_X3.110.so
+%exclude %{_libdir}/gconv/CP1252.so
+%exclude %{_libdir}/gconv/ISO8859-1.so
+%exclude %{_libdir}/gconv/ISO8859-15.so
+%exclude %{_libdir}/gconv/UNICODE.so
+%exclude %{_libdir}/gconv/UTF-16.so
+%exclude %{_libdir}/gconv/UTF-32.so
+%exclude %{_libdir}/gconv/UTF-7.so
+%ifarch s390x
+%exclude %{_libdir}/gconv/gconv-modules.d/gconv-modules-s390.conf
+%exclude %{_libdir}/gconv/ISO-8859-1_CP037_Z900.so
+%exclude %{_libdir}/gconv/UTF8_UTF32_Z9.so
+%exclude %{_libdir}/gconv/UTF16_UTF32_Z9.so
+%exclude %{_libdir}/gconv/UTF8_UTF16_Z9.so
+%endif
 
 %files locale-base
 %defattr(-,root,root)
@@ -1274,11 +1325,6 @@ exit 0
 %{_prefix}/lib/locale/C.utf8
 %{_prefix}/lib/locale/en_US.utf8
 %endif
-%dir %{_libdir}/gconv
-%{_libdir}/gconv/*.so
-%{_libdir}/gconv/gconv-modules
-%{_libdir}/gconv/gconv-modules.d
-%attr(0644,root,root) %verify(not md5 size mtime) %ghost %{_libdir}/gconv/gconv-modules.cache
 
 %files locale
 %defattr(-,root,root)