diff --git a/gendep.macros b/gendep.macros
index 6362bd2..48f8c80 100644
--- a/gendep.macros
+++ b/gendep.macros
@@ -2038,19 +2038,15 @@ Requires: perl(Tie::Handle) \
 Requires: perl(Tie::StdHandle) \
 Requires: perl(Time::tm) \
 Requires: perl(Unicode::Normalize) \
-Requires: perl(_charnames) \
-Requires: perl(bytes) \
 Requires: perl(charnames) \
 Requires: perl(constant) \
 Requires: perl(feature) \
 Requires: perl(if) \
 Requires: perl(integer) \
 Requires: perl(overload) \
-Requires: perl(re) \
 Requires: perl(strict) \
 Requires: perl(threads) \
 Requires: perl(threads::shared) \
-Requires: perl(unicore::Name) \
 Requires: perl(warnings) \
 Requires: perl(warnings::register) \
 Provides: perl(Class::Struct) = 0.65 \
@@ -2101,10 +2097,6 @@ Provides: perl(UNIVERSAL) = 1.13 \
 Provides: perl(Unicode::UCD) = 0.72 \
 Provides: perl(User::grent) = 1.03 \
 Provides: perl(User::pwent) = 1.01 \
-Provides: perl(_charnames) = 1.45 \
-Provides: perl(bytes) = 1.07 \
-Provides: perl(bytes_heavy.pl) \
-Provides: perl(charnames) = 1.45 \
 Provides: perl(deprecate) = 0.04 \
 Provides: perl(diagnostics) = 1.36 \
 Provides: perl(dumpvar.pl) \
@@ -2178,8 +2170,12 @@ Requires: perl(vars) \
 %{nil}
 %global gendep_perl_libs \
 Requires: perl(XSLoader) \
+Requires: perl(bytes) \
+Requires: perl(_charnames) \
 Requires: perl(integer) \
+Requires: perl(re) \
 Requires: perl(strict) \
+Requires: perl(unicore::Name) \
 Requires: perl(warnings) \
 Provides: perl(:MODULE_COMPAT_5.30.0) \
 Provides: perl(:VERSION) = 5.30.0 \
@@ -2197,6 +2193,9 @@ Provides: perl(PerlIO::via) = 0.17 \
 Provides: perl(Tie::Hash::NamedCapture) = 0.10 \
 Provides: perl(XSLoader) = 0.30 \
 Provides: perl(attributes) = 0.33 \
+Provides: perl(bytes) = 1.07 \
+Provides: perl(_charnames) = 1.45 \
+Provides: perl(charnames) = 1.45 \
 Provides: perl(integer) = 1.01 \
 Provides: perl(re) = 0.37 \
 Provides: perl(strict) = 1.11 \
diff --git a/perl.spec b/perl.spec
index ae750a9..3a07a7f 100644
--- a/perl.spec
+++ b/perl.spec
@@ -485,7 +485,6 @@ Requires(post): perl-libs
 Requires(post): perl-macros
 
 # File provides
-Provides:       perl(bytes_heavy.pl)
 Provides:       perl(dumpvar.pl)
 Provides:       perl(perl5db.pl)
 
@@ -537,6 +536,8 @@ Provides:       perl(:WITH_THREADS)
 Provides:       perl(:WITH_LARGEFILES)
 # PerlIO provides
 Provides:       perl(:WITH_PERLIO)
+# A file provide for bytes module
+Provides:       perl(bytes_heavy.pl)
 # Loaded by charnames, unicore/Name.pm does not declare unicore::Name module
 Provides:       perl(unicore::Name)
 # Keep utf8 modules in perl-libs because a sole regular expression like /\pN/
@@ -545,6 +546,8 @@ Provides:       perl(utf8_heavy.pl)
 # utf8 and utf8_heavy.pl require Carp, re, strict, warnings, XSLoader
 Requires:       perl(Carp)
 Requires:       perl(Exporter)
+# File::Spec loaded by _charnames.pm that is loaded by \N{}
+Requires:       perl(File::Spec)
 # Term::Cap is optional
 %if %{defined perl_bootstrap}
 %gendep_perl_libs
@@ -4061,6 +4064,10 @@ popd
 %exclude %dir %{perl_vendorarch}
 %exclude %dir %{perl_vendorarch}/auto
 %exclude %dir %{privlib}
+%exclude %{privlib}/bytes.pm
+%exclude %{privlib}/bytes_heavy.pl
+%exclude %{privlib}/_charnames.pm
+%exclude %{privlib}/charnames.pm
 %exclude %{privlib}/integer.pm
 %exclude %{privlib}/PerlIO.pm
 %exclude %{privlib}/strict.pm
@@ -4071,6 +4078,8 @@ popd
 %exclude %{privlib}/XSLoader.pm
 %exclude %dir %{perl_vendorlib}
 %exclude %{_mandir}/man3/attributes.*
+%exclude %{_mandir}/man3/bytes.*
+%exclude %{_mandir}/man3/charnames.*
 %exclude %{_mandir}/man3/File::Glob.*
 %exclude %{_mandir}/man3/integer.*
 %exclude %{_mandir}/man3/PerlIO.*
@@ -5155,6 +5164,10 @@ popd
 %dir %{perl_vendorarch}
 %dir %{perl_vendorarch}/auto
 %dir %{privlib}
+%{privlib}/bytes.pm
+%{privlib}/bytes_heavy.pl
+%{privlib}/_charnames.pm
+%{privlib}/charnames.pm
 %{privlib}/integer.pm
 %{privlib}/PerlIO.pm
 %{privlib}/strict.pm
@@ -5165,6 +5178,8 @@ popd
 %{privlib}/XSLoader.pm
 %dir %{perl_vendorlib}
 %{_mandir}/man3/attributes.*
+%{_mandir}/man3/bytes.*
+%{_mandir}/man3/charnames.*
 %{_mandir}/man3/File::Glob.*
 %{_mandir}/man3/integer.*
 %{_mandir}/man3/PerlIO.*
@@ -6504,6 +6519,7 @@ popd
 - Subpackage AnyDBM_File
 - Subpackage Benchmark
 - Subpackage blib
+- Move charnames to perl-libs
 
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4:5.30.1-450
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild