diff --git a/radvd.spec b/radvd.spec
index f869bc6..dacaf71 100644
--- a/radvd.spec
+++ b/radvd.spec
@@ -1,14 +1,13 @@
 Summary: A Router Advertisement daemon
 Name: radvd
-Version: 2.17
-Release: 19%{?dist}
+Version: 2.18
+Release: 1%{?dist}
 
 # The code includes the advertising clause, so it's GPL-incompatible
 License: BSD with advertising
 URL: http://www.litech.org/radvd/
 Source0: %{url}dist/%{name}-%{version}.tar.xz
 Source1: radvd-tmpfs.conf
-Source2: radvd.service
 ## https://github.com/reubenhwk/radvd/commit/6e45acbf3d64b9bd945adcb3de622fd7d059ceb9.patch
 Patch0: radvd-werror.patch
 Patch1: radvd-endianess.patch
@@ -39,11 +38,6 @@ services.
 
 %prep
 %setup -q
-%patch0 -p1 -b .werror
-%patch1 -p1 -b .endianess
-%patch2 -p1 -b .stderr
-%patch3 -p1 -b .nodaemon
-%patch4 -p1 -b .ifacelist
 
 for F in CHANGES; do
     iconv -f iso-8859-1 -t utf-8 < "$F" > "${F}.new"
@@ -67,12 +61,12 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 mkdir -p %{buildroot}/run/radvd
 mkdir -p %{buildroot}%{_unitdir}
 
-install -m 644 redhat/radvd.conf.empty %{buildroot}%{_sysconfdir}/radvd.conf
-install -m 644 redhat/radvd.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/radvd
+install -m 644 redhat/SysV/radvd.conf.empty %{buildroot}%{_sysconfdir}/radvd.conf
+install -m 644 redhat/SysV/radvd.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/radvd
 
 install -d -m 755 %{buildroot}%{_tmpfilesdir}
 install -p -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/radvd.conf
-install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
+install -m 644 redhat/systemd/radvd.service %{buildroot}%{_unitdir}
 
 %check
 make check