diff --git a/baselibs.conf b/baselibs.conf
index bbfdda3..f43da97 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -9,6 +9,11 @@ glibc
   +/usr/lib/getconf/[^g]
   +/usr/sbin/iconvconfig -> /usr/sbin/iconvconfig-<extension>
 glibc-locale-base
+  arch i586 block!
+  +/usr/lib(64)?/gconv/gconv-modules
+  targettype x86 -/usr/lib(64)?/gconv/gconv-modules
+  post "/usr/sbin/iconvconfig-<extension>"
+glibc-locale
   arch i586 block!
   +/usr/lib(64)?/gconv/gconv-modules
   targettype x86 -/usr/lib(64)?/gconv/gconv-modules
diff --git a/glibc.changes b/glibc.changes
index ff56302..ce220e7 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 15 13:10:55 UTC 2024 - Andreas Schwab <schwab@suse.de>
+
+- Move gconv extra modules into glibc-locale package
+
 -------------------------------------------------------------------
 Mon May 13 09:45:36 UTC 2024 - Andreas Schwab <schwab@suse.de>
 
diff --git a/glibc.spec b/glibc.spec
index 9cb9bfd..230bd9c 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1162,14 +1162,15 @@ 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 locale -p %{_sbindir}/iconvconfig
+
+%post locale-base -p %{_sbindir}/iconvconfig
 
 %post info
 %install_info --info-dir=%{_infodir} %{_infodir}/libc.info.gz
@@ -1275,9 +1276,16 @@ exit 0
 %{_prefix}/lib/locale/en_US.utf8
 %endif
 %dir %{_libdir}/gconv
-%{_libdir}/gconv/*.so
+%dir %{_libdir}/gconv/gconv-modules.d
 %{_libdir}/gconv/gconv-modules
-%{_libdir}/gconv/gconv-modules.d
+%{_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
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %{_libdir}/gconv/gconv-modules.cache
 
 %files locale
@@ -1286,6 +1294,16 @@ exit 0
 %{_prefix}/lib/locale
 %exclude %{_prefix}/lib/locale/C.utf8
 %exclude %{_prefix}/lib/locale/en_US.utf8
+%{_libdir}/gconv/gconv-modules.d/gconv-modules-*.conf
+%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
+%{_libdir}/gconv/*.so
 %endif
 
 %files devel