diff --git a/.gitignore b/.gitignore
index bdcb518..b14a16e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,4 @@
 /dnf-plugins-core-4.4.4.tar.gz
 /dnf-plugins-core-4.5.0.tar.gz
 /dnf-plugins-core-4.6.0.tar.gz
+/dnf-plugins-core-4.7.0.tar.gz
diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec
index 7d54d9c..6f0fb89 100644
--- a/dnf-plugins-core.spec
+++ b/dnf-plugins-core.spec
@@ -8,6 +8,8 @@
 
 %define __cmake_in_source_build 1
 
+%bcond dnf5_obsoletes_dnf %[0%{?fedora} > 40 || 0%{?rhel} > 11]
+
 %if 0%{?rhel} && 0%{?rhel} <= 7
 %bcond_with python3
 %else
@@ -33,7 +35,7 @@
 %endif
 
 Name:           dnf-plugins-core
-Version:        4.6.0
+Version:        4.7.0
 Release:        1%{?dist}
 Summary:        Core Plugins for DNF
 License:        GPL-2.0-or-later
@@ -496,8 +498,16 @@ pushd %{buildroot}%{_unitdir}/system-update.target.wants/
   ln -sr ../dnf-system-upgrade.service
 popd
 
-ln -sf %{_mandir}/man8/dnf-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf-offline-upgrade.8.gz
-ln -sf %{_mandir}/man8/dnf-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf-offline-distrosync.8.gz
+ln -sf %{_mandir}/man8/dnf4-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf4-offline-upgrade.8.gz
+ln -sf %{_mandir}/man8/dnf4-system-upgrade.8.gz %{buildroot}%{_mandir}/man8/dnf4-offline-distrosync.8.gz
+%endif
+
+%if %{without dnf5_obsoletes_dnf}
+for file in %{buildroot}%{_mandir}/man8/dnf4[-.]*; do
+    dir=$(dirname $file)
+    filename=$(basename $file)
+    ln -sr $file $dir/${filename/dnf4/dnf}
+done
 %endif
 
 %find_lang %{name}
@@ -549,24 +559,24 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
 %endif
 
 %files
-%{_mandir}/man8/dnf-builddep.*
-%{_mandir}/man8/dnf-changelog.*
-%{_mandir}/man8/dnf-config-manager.*
-%{_mandir}/man8/dnf-copr.*
-%{_mandir}/man8/dnf-debug.*
-%{_mandir}/man8/dnf-debuginfo-install.*
-%{_mandir}/man8/dnf-download.*
-%{_mandir}/man8/dnf-generate_completion_cache.*
-%{_mandir}/man8/dnf-groups-manager.*
-%{_mandir}/man8/dnf-needs-restarting.*
-%{_mandir}/man8/dnf-repoclosure.*
-%{_mandir}/man8/dnf-repodiff.*
-%{_mandir}/man8/dnf-repograph.*
-%{_mandir}/man8/dnf-repomanage.*
-%{_mandir}/man8/dnf-reposync.*
-%{_mandir}/man8/dnf-system-upgrade.*
-%{_mandir}/man8/dnf-offline-upgrade.*
-%{_mandir}/man8/dnf-offline-distrosync.*
+%{_mandir}/man8/dnf*-builddep.*
+%{_mandir}/man8/dnf*-changelog.*
+%{_mandir}/man8/dnf*-config-manager.*
+%{_mandir}/man8/dnf*-copr.*
+%{_mandir}/man8/dnf*-debug.*
+%{_mandir}/man8/dnf*-debuginfo-install.*
+%{_mandir}/man8/dnf*-download.*
+%{_mandir}/man8/dnf*-generate_completion_cache.*
+%{_mandir}/man8/dnf*-groups-manager.*
+%{_mandir}/man8/dnf*-needs-restarting.*
+%{_mandir}/man8/dnf*-repoclosure.*
+%{_mandir}/man8/dnf*-repodiff.*
+%{_mandir}/man8/dnf*-repograph.*
+%{_mandir}/man8/dnf*-repomanage.*
+%{_mandir}/man8/dnf*-reposync.*
+%{_mandir}/man8/dnf*-system-upgrade.*
+%{_mandir}/man8/dnf*-offline-upgrade.*
+%{_mandir}/man8/dnf*-offline-distrosync.*
 %if %{with yumcompatibility}
 %{_mandir}/man1/yum-changelog.*
 %{_mandir}/man8/yum-copr.*
@@ -712,18 +722,18 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
 %if %{with python2}
 %files -n python2-dnf-plugin-leaves
 %{python2_sitelib}/dnf-plugins/leaves.*
-%{_mandir}/man8/dnf-leaves.*
+%{_mandir}/man8/dnf*-leaves.*
 %endif
 
 %if %{with python3}
 %files -n python3-dnf-plugin-leaves
 %{python3_sitelib}/dnf-plugins/leaves.*
 %{python3_sitelib}/dnf-plugins/__pycache__/leaves.*
-%{_mandir}/man8/dnf-leaves.*
+%{_mandir}/man8/dnf*-leaves.*
 %endif
 
 %else
-%exclude %{_mandir}/man8/dnf-leaves.*
+%exclude %{_mandir}/man8/dnf*-leaves.*
 %if %{with python2}
 %exclude %{python2_sitelib}/dnf-plugins/leaves.*
 %endif
@@ -738,7 +748,7 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
 %files -n python2-dnf-plugin-local
 %config(noreplace) %{_sysconfdir}/dnf/plugins/local.conf
 %{python2_sitelib}/dnf-plugins/local.*
-%{_mandir}/man8/dnf-local.*
+%{_mandir}/man8/dnf*-local.*
 %endif
 
 %if %{with python3} && 0%{?rhel} == 0
@@ -746,7 +756,7 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
 %config(noreplace) %{_sysconfdir}/dnf/plugins/local.conf
 %{python3_sitelib}/dnf-plugins/local.*
 %{python3_sitelib}/dnf-plugins/__pycache__/local.*
-%{_mandir}/man8/dnf-local.*
+%{_mandir}/man8/dnf*-local.*
 %endif
 
 %if %{with python2}
@@ -762,7 +772,7 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
 %config(noreplace) %{_sysconfdir}/dnf/plugins/post-transaction-actions.conf
 %config(noreplace) %{_sysconfdir}/dnf/plugins/post-transaction-actions.d
 %{python2_sitelib}/dnf-plugins/post-transaction-actions.*
-%{_mandir}/man8/dnf-post-transaction-actions.*
+%{_mandir}/man8/dnf*-post-transaction-actions.*
 %endif
 
 %if %{with python3}
@@ -771,7 +781,7 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
 %config(noreplace) %{_sysconfdir}/dnf/plugins/post-transaction-actions.d
 %{python3_sitelib}/dnf-plugins/post-transaction-actions.*
 %{python3_sitelib}/dnf-plugins/__pycache__/post-transaction-actions.*
-%{_mandir}/man8/dnf-post-transaction-actions.*
+%{_mandir}/man8/dnf*-post-transaction-actions.*
 %endif
 
 %if %{with python2}
@@ -779,7 +789,7 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
 %config(noreplace) %{_sysconfdir}/dnf/plugins/pre-transaction-actions.conf
 %config(noreplace) %{_sysconfdir}/dnf/plugins/pre-transaction-actions.d
 %{python2_sitelib}/dnf-plugins/pre-transaction-actions.*
-%{_mandir}/man8/dnf-pre-transaction-actions.*
+%{_mandir}/man8/dnf*-pre-transaction-actions.*
 %endif
 
 %if %{with python3}
@@ -788,7 +798,7 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
 %config(noreplace) %{_sysconfdir}/dnf/plugins/pre-transaction-actions.d
 %{python3_sitelib}/dnf-plugins/pre-transaction-actions.*
 %{python3_sitelib}/dnf-plugins/__pycache__/pre-transaction-actions.*
-%{_mandir}/man8/dnf-pre-transaction-actions.*
+%{_mandir}/man8/dnf*-pre-transaction-actions.*
 %endif
 
 %if 0%{?rhel} == 0
@@ -796,18 +806,18 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
 %if %{with python2}
 %files -n python2-dnf-plugin-show-leaves
 %{python2_sitelib}/dnf-plugins/show_leaves.*
-%{_mandir}/man8/dnf-show-leaves.*
+%{_mandir}/man8/dnf*-show-leaves.*
 %endif
 
 %if %{with python3}
 %files -n python3-dnf-plugin-show-leaves
 %{python3_sitelib}/dnf-plugins/show_leaves.*
 %{python3_sitelib}/dnf-plugins/__pycache__/show_leaves.*
-%{_mandir}/man8/dnf-show-leaves.*
+%{_mandir}/man8/dnf*-show-leaves.*
 %endif
 
 %else
-%exclude %{_mandir}/man8/dnf-show-leaves.*
+%exclude %{_mandir}/man8/dnf*-show-leaves.*
 %if %{with python2}
 %exclude %{python2_sitelib}/dnf-plugins/show_leaves.*
 %endif
@@ -823,7 +833,7 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
 %config(noreplace) %{_sysconfdir}/dnf/plugins/versionlock.conf
 %config(noreplace) %{_sysconfdir}/dnf/plugins/versionlock.list
 %{python2_sitelib}/dnf-plugins/versionlock.*
-%{_mandir}/man8/dnf-versionlock.*
+%{_mandir}/man8/dnf*-versionlock.*
 %if %{with yumcompatibility}
 %{_mandir}/man8/yum-versionlock.*
 %{_mandir}/man5/yum-versionlock.*
@@ -839,7 +849,7 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
 %config(noreplace) %{_sysconfdir}/dnf/plugins/versionlock.list
 %{python3_sitelib}/dnf-plugins/versionlock.*
 %{python3_sitelib}/dnf-plugins/__pycache__/versionlock.*
-%{_mandir}/man8/dnf-versionlock.*
+%{_mandir}/man8/dnf*-versionlock.*
 %if %{with yumcompatibility}
 %{_mandir}/man8/yum-versionlock.*
 %{_mandir}/man5/yum-versionlock.*
@@ -853,10 +863,16 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/
 %files -n python3-dnf-plugin-modulesync
 %{python3_sitelib}/dnf-plugins/modulesync.*
 %{python3_sitelib}/dnf-plugins/__pycache__/modulesync.*
-%{_mandir}/man8/dnf-modulesync.*
+%{_mandir}/man8/dnf*-modulesync.*
 %endif
 
 %changelog
+* Wed Apr 24 2024 Jan Kolarik <jkolarik@redhat.com> - 4.7.0-1
+- Update to 4.7.0 (RHEL-38831)
+- docs: Documentation of needs-restarting boot time (RHEL-35577)
+- man: Prepare pages for dnf5 switch
+- spec: Prepare for switch of dnf5 in Rawhide
+
 * Tue Mar 26 2024 Evan Goode <egoode@redhat.com> - 4.6.0-1
 - Update to 4.6.0 (RHEL-38831)
 - Added pre-transaction plugin
diff --git a/sources b/sources
index ad7b880..902a63d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dnf-plugins-core-4.6.0.tar.gz) = 6d3a3720dd495af280d6ad89273b20778b056f0e8be6b0b1e9a2c45eb2e677f12ab680268cb3acf78de7bdd43c7ec04d3559ccd8246cb0041006ea4cf8605c46
+SHA512 (dnf-plugins-core-4.7.0.tar.gz) = 78c92429638c440005913578d7d91087ed329ea191cc35f4c5f58f1ac3f7b617b6f724aa9b96fb6e73f448d8a304a570fece3a834003a688e248bd24bc7acbfa