diff --git a/freeipmi.spec b/freeipmi.spec
index a1f2b8c..d1e2835 100644
--- a/freeipmi.spec
+++ b/freeipmi.spec
@@ -3,19 +3,18 @@
 
 Name:             freeipmi
 Version:          1.5.7
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          IPMI remote console and system management software
 License:          GPLv3+
-Group:            Applications/System
 URL:              http://www.gnu.org/software/freeipmi/
 Source0:          http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Source1:          bmc-watchdog.service
 Source2:          ipmidetectd.service
 Source3:          ipmiseld.service
-BuildRequires:    libgcrypt-devel texinfo systemd
-Requires(preun):  info systemd
-Requires(post):   info systemd systemd-sysv
-Requires(postun): systemd
+BuildRequires:    libgcrypt-devel texinfo systemd 
+%{?systemd_requires}
+Requires:         gcc
+Requires(post):   /sbin/ldconfig
 Patch1:           freeipmi-1.5.6-manpage.patch
 
 %description
@@ -25,7 +24,6 @@ Platform Management Interface specification.
 
 %package          devel
 Summary:          Development package for FreeIPMI
-Group:            Development/System
 Requires:         %{name}%{?_isa} = %{version}-%{release}
 %description      devel
 Development package for FreeIPMI. This package includes the FreeIPMI
@@ -33,21 +31,18 @@ header files and libraries.
 
 %package          bmc-watchdog
 Summary:          IPMI BMC watchdog
-Group:            Applications/System
 Requires:         %{name}%{?_isa} = %{version}-%{release}
 %description      bmc-watchdog
 Provides a watchdog daemon for OS monitoring and recovery.
 
 %package          ipmidetectd
 Summary:          IPMI node detection monitoring daemon
-Group:            Applications/System
 Requires:         %{name}%{?_isa} = %{version}-%{release}
 %description      ipmidetectd
 Provides a tool and a daemon for IPMI node detection.
 
 %package          ipmiseld
 Summary:          IPMI SEL syslog logging daemon
-Group:            Applications/System
 Requires:         %{name}%{?_isa} = %{version}-%{release}
 %description      ipmiseld
 IPMI SEL syslog logging daemon.
@@ -57,8 +52,7 @@ IPMI SEL syslog logging daemon.
 %endif
 
 %prep
-%setup -q
-%patch1 -p1 -b .manpage
+%autosetup -p1
 
 %build
 export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS"
@@ -91,7 +85,7 @@ if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir &>/dev/null || :
 fi
 
-%postun -p /sbin/ldconfig
+%ldconfig_postun
 
 %post bmc-watchdog
 %systemd_post bmc-watchdog.service
@@ -360,6 +354,9 @@ fi
 %dir %{_localstatedir}/cache/ipmiseld
 
 %changelog
+* Wed Feb 21 2018 Josef Ridky <jridky@redhat.com> - 1.5.7-3
+- Spec clean up (remove Group tag, add new macros and gcc dependency)
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild