diff --git a/bleachbit.spec b/bleachbit.spec
index b3da8c9..6ac5a93 100644
--- a/bleachbit.spec
+++ b/bleachbit.spec
@@ -43,6 +43,24 @@ to make them run faster.
 %prep
 %setup -q
 
+# Upstream also creates this extra .desktop file, for running BleachBit as root, by copying the basic version instead of tracking a separate file in git.
+cp -p  ./org.bleachbit.BleachBit.desktop  ./org.bleachbit.BleachBit-root.desktop
+sed --regexp-extended 's/^Name=BleachBit$/Name=BleachBit as Administrator/g'  --in-place ./org.bleachbit.BleachBit-root.desktop
+sed --regexp-extended 's/^(.*Exec)=bleachbit$/\1=bleachbit-root/g'            --in-place ./org.bleachbit.BleachBit-root.desktop
+
+cat > ./bleachbit.pam <<EOF
+#%PAM-1.0
+auth       include    config-util
+account    include    config-util
+session    include    config-util
+EOF
+
+cat > ./bleachbit.console <<EOF
+USER=root
+PROGRAM=%{_bindir}/bleachbit
+SESSION=true
+EOF
+
 # Disable update notifications, since package will be updated by DNF or Packagekit.
 sed 's/online_update_notification_enabled = True/online_update_notification_enabled = False/g'  --in-place ./bleachbit/__init__.py
 
@@ -61,8 +79,13 @@ make delete_windows_files
 %make_install  PYTHON=%{__python3}  DESTDIR=%{buildroot}  prefix=%{_prefix}  INSTALL="%{_bindir}/install -Dp"
 %make_install --directory ./po/
 
-desktop-file-install --dir=%{buildroot}/%{_datadir}/applications/  org.bleachbit.BleachBit.desktop
-mkdir -p %{buildroot}/%{_metainfodir}/
+install -Dp  ./bleachbit.pam      %{buildroot}/%{_sysconfdir}/pam.d/bleachbit-root
+install -Dp  ./bleachbit.console  %{buildroot}/%{_sysconfdir}/security/console.apps/bleachbit-root
+mkdir -p %{buildroot}/%{_sbindir}
+ln --symbolic  %{_bindir}/consolehelper  %{buildroot}/%{_bindir}/bleachbit-root
+ln --symbolic  %{_bindir}/bleachbit      %{buildroot}/%{_sbindir}/bleachbit-root
+
+desktop-file-install --dir=%{buildroot}/%{_datadir}/applications/  org.bleachbit.BleachBit*.desktop
 install -Dp  org.bleachbit.BleachBit.metainfo.xml  %{buildroot}/%{_metainfodir}/
 
 %find_lang %{name}
@@ -70,7 +93,7 @@ install -Dp  org.bleachbit.BleachBit.metainfo.xml  %{buildroot}/%{_metainfodir}/
 
 
 %check
-desktop-file-validate %{buildroot}/%{_datadir}/applications/org.bleachbit.BleachBit.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/org.bleachbit.BleachBit*.desktop
 appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.bleachbit.BleachBit.metainfo.xml
 
 
@@ -84,11 +107,14 @@ update-desktop-database
 %doc  README*  CONTRIBUTING.md
 %license COPYING
 %{_bindir}/bleachbit*
-%{_datadir}/applications/org.bleachbit.BleachBit.desktop
-%{_metainfodir}/org.bleachbit.BleachBit.metainfo.xml
-%{_datadir}/polkit-1/actions/org.bleachbit.policy
+%{_sbindir}/bleachbit*
 %{_datadir}/bleachbit/
+%{_datadir}/applications/org.bleachbit.BleachBit*.desktop
+%{_metainfodir}/org.bleachbit.BleachBit.metainfo.xml
 %{_datadir}/pixmaps/bleachbit.png
+%{_datadir}/polkit-1/actions/org.bleachbit.policy
+%config(noreplace) %{_sysconfdir}/pam.d/bleachbit-root
+%config(noreplace) %{_sysconfdir}/security/console.apps/bleachbit-root