diff --git a/policycoreutils.spec b/policycoreutils.spec
index faf480f..2875268 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -11,7 +11,6 @@ Name:    policycoreutils
 Version: 2.7
 Release: 11%{?dist}
 License: GPLv2
-Group:   System Environment/Base
 # https://github.com/SELinuxProject/selinux/wiki/Releases
 Source0: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804/policycoreutils-2.7.tar.gz
 Source1: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804/selinux-python-2.7.tar.gz
@@ -142,13 +141,13 @@ rm -f %{buildroot}/etc/pam.d/run_init*
 
 ln -sf /usr/share/system-config-selinux/polgengui.py %{buildroot}%{_bindir}/selinux-polgengui
 
-desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications --add-category Settings \
+desktop-file-install --dir %{buildroot}%{_datadir}/applications --add-category Settings \
     %{buildroot}%{_datadir}/system-config-selinux/system-config-selinux.desktop
 
-desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications --add-category Settings \
+desktop-file-install --dir %{buildroot}%{_datadir}/applications --add-category Settings \
     %{buildroot}%{_datadir}/system-config-selinux/sepolicy.desktop
 
-desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+desktop-file-install --dir %{buildroot}%{_datadir}/applications \
     %{buildroot}%{_datadir}/system-config-selinux/selinux-polgengui.desktop
 
 rm -f %{buildroot}%{_datadir}/system-config-selinux/selinux-polgengui.desktop
@@ -238,7 +237,6 @@ an SELinux environment.
 
 %package python3
 Summary: SELinux policy core python3 interfaces
-Group:   System Environment/Base
 Requires:policycoreutils = %{version}-%{release}
 Requires:libsemanage-python3 >= %{libsemanagever} libselinux-python3 libcgroup
 Requires:audit-libs-python3 >=  %{libauditver}
@@ -277,7 +275,6 @@ Provides: %{name}-python = %{version}-%{release}
 Provides: %{name}-python%{?_isa} = %{version}-%{release}
 Obsoletes: %{name}-python < %{version}-%{release}
 Summary: SELinux policy core python utilities
-Group:   System Environment/Base
 Requires:policycoreutils = %{version}-%{release}
 Requires:libsemanage-python >= %{libsemanagever} libselinux-python libcgroup
 Requires:audit-libs-python2 >=  %{libauditver}
@@ -308,7 +305,6 @@ an SELinux environment.
 
 %package devel
 Summary: SELinux policy core policy devel utilities
-Group:   System Environment/Base
 Requires: policycoreutils-python-utils = %{version}-%{release}
 Requires: /usr/bin/make dnf
 Requires: selinux-policy-devel
@@ -344,7 +340,6 @@ The policycoreutils-devel package contains the management tools use to develop p
 
 %package sandbox
 Summary: SELinux sandbox utilities
-Group:   System Environment/Base
 Requires: policycoreutils-python3 = %{version}-%{release}
 Requires: xorg-x11-server-Xephyr >= 1.14.1-2 /usr/bin/rsync /usr/bin/xmodmap
 Requires: openbox
@@ -364,7 +359,6 @@ sandboxes
 
 %package newrole
 Summary: The newrole application for RBAC/MLS
-Group: System Environment/Base
 Requires: policycoreutils = %{version}-%{release}
 
 %description newrole
@@ -378,7 +372,6 @@ or level of a logged in user.
 
 %package gui
 Summary: SELinux configuration GUI
-Group: System Environment/Base
 Requires: policycoreutils-devel = %{version}-%{release}, policycoreutils-python3 = %{version}-%{release}
 Requires: policycoreutils-dbus = %{version}-%{release}
 BuildRequires: desktop-file-utils
@@ -459,7 +452,6 @@ system-config-selinux is a utility for managing the SELinux environment
 
 %package restorecond
 Summary: SELinux restorecond utilities
-Group:   System Environment/Base
 BuildRequires: systemd-units
 
 %description restorecond