diff --git a/aide.spec b/aide.spec
index 4681c42..70cfe3c 100644
--- a/aide.spec
+++ b/aide.spec
@@ -1,82 +1,75 @@
-Summary: Intrusion detection environment
-Name: aide
-Version: 0.16
-Release: 5%{?dist}
-URL: http://sourceforge.net/projects/%{name}
-License: GPLv2+
-Group: Applications/System
-
-
-Source0: https://sourceforge.net/projects/%{name}/files/aide/%{version}/%{name}-%{version}.tar.gz
-Source1: aide.conf
-Source2: README.quickstart
-Source3: aide.logrotate
-
-
-BuildRequires: mktemp 
-BuildRequires: elfutils-libelf-devel
-Buildrequires: zlib-devel libgcrypt-devel
-Buildrequires: flex bison
-Buildrequires: libattr-devel e2fsprogs-devel
-Buildrequires: libacl-devel libselinux-devel
-Buildrequires: audit-libs-devel >= 1.2.8-2
-
+Summary:        Intrusion detection environment
+Name:           aide
+Version:        0.16
+Release:        5%{?dist}
+URL:            http://sourceforge.net/projects/aide
+License:        GPLv2+
+
+
+Source0:        %{url}/files/aide/%{version}/%{name}-%{version}.tar.gz
+Source1:        aide.conf
+Source2:        README.quickstart
+Source3:        aide.logrotate
+
+BuildRequires:  gcc
+BuildRequires:  make
+BuildRequires:  bison flex
+BuildRequires:  pcre-devel
+BuildRequires:  libgpg-error-devel libgcrypt-devel
+BuildRequires:  zlib-devel
+BuildRequires:  libcurl-devel
+BuildRequires:  libacl-devel
+BuildRequires:  pkgconfig(libselinux)
+BuildRequires:  libattr-devel
+BuildRequires:  e2fsprogs-devel
+Buildrequires:  audit-libs-devel
 
 # Customize the database file location in the man page.
 Patch1: aide-0.16rc1-man.patch
 # fix aide in FIPS mode
 Patch2: aide-0.16b1-fipsfix.patch
 
-
 %description
 AIDE (Advanced Intrusion Detection Environment) is a file integrity
 checker and intrusion detection program.
 
-
 %prep
-%setup -q
-%patch1 -p1 -b .man
-%patch2 -p1 -b .fipsfix
-
+%autosetup -p1
+cp -a %{S:2} .
 
 %build
-%configure --with-config_file=%{_sysconfdir}/aide.conf \
-           --with-zlib \
-           --disable-static \
-           --with-posix-acl \
-           --with-selinux \
-           --with-xattr \
-           --with-e2fsattrs \
-           --with-audit
-
-
-make
-
+%configure  \
+  --disable-static \
+  --with-config_file=%{_sysconfdir}/aide.conf \
+  --with-gcrypt \
+  --with-zlib \
+  --with-curl \
+  --with-posix-acl \
+  --with-selinux \
+  --with-xattr \
+  --with-e2fsattrs \
+  --with-audit
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT bindir=%{_sbindir} install
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/aide
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
-mkdir -p -m0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/aide
-install -p %{SOURCE2} README.quickstart
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/aide
-
+%make_install bindir=%{_sbindir}
+install -Dpm0644 -t %{buildroot}%{_sysconfdir} %{S:1}
+install -Dpm0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/aide
+mkdir -p %{buildroot}%{_localstatedir}/log/aide
+mkdir -p -m0700 %{buildroot}%{_localstatedir}/lib/aide
 
 %files
-%doc AUTHORS COPYING ChangeLog NEWS README doc/manual.html contrib/
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README doc/manual.html contrib/
 %doc README.quickstart
-%attr(0755,root,root) %{_sbindir}/aide
-%{_mandir}/man1/*
-%{_mandir}/man5/*
+%{_sbindir}/aide
+%{_mandir}/man1/*.1*
+%{_mandir}/man5/*.5*
 %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/aide.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/aide
 %dir %attr(0700,root,root) %{_localstatedir}/lib/aide
 %dir %attr(0700,root,root) %{_localstatedir}/log/aide
 
-
 %changelog
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.16-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild