diff --git a/iputils.changes b/iputils.changes
index 588bcb2..221e59d 100644
--- a/iputils.changes
+++ b/iputils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 28 11:31:33 UTC 2017 - mpluskal@suse.com
+
+- Reintroduce rarpd as subpackage
+- Explicitly list content in filelist as we have two subpackages
+  now
+
 -------------------------------------------------------------------
 Mon Nov 13 17:24:40 UTC 2017 - mpluskal@suse.com
 
diff --git a/iputils.spec b/iputils.spec
index 83bd41f..e422089 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -49,6 +49,15 @@ Provides:       /sbin/arping
 This package contains some small network tools for IPv4 and IPv6 like
 rdisc, ping, arping and tracepath.
 
+%package -n rarpd
+Summary:        Reverse Address Resolution Protocol Daemon
+Group:          Productivity/Networking/System
+
+%description -n rarpd
+Rarpd listens on the Ethernet for broadcast packets asking for reverse
+address resolution.  These packets are sent by hosts at boot time to find
+out their IP addresses.
+
 %prep
 %setup -q
 %patch8 -p1
@@ -78,10 +87,11 @@ mkdir -p %{buildroot}/%{_sbindir}
 mkdir -p %{buildroot}/%{_bindir}
 install arping		%{buildroot}/%{_sbindir}
 install clockdiff	%{buildroot}/%{_sbindir}
-install rdisc		%{buildroot}/%{_sbindir}/in.rdisc
+install rarpd	    %{buildroot}/%{_sbindir}
+install rdisc		  %{buildroot}/%{_sbindir}/in.rdisc
 # boo#795788
 install tracepath	%{buildroot}/%{_bindir}
-install ping		%{buildroot}/%{_bindir}
+install ping		  %{buildroot}/%{_bindir}
 # boo#1017616
 ln -sf %{_bindir}/ping %{buildroot}/%{_bindir}/ping6
 ln -sf %{_bindir}/tracepath %{buildroot}/%{_bindir}/tracepath6
@@ -93,6 +103,7 @@ ln -sf %{_bindir}/tracepath %{buildroot}/%{_bindir}/tracepath6
 mkdir -p %{buildroot}/{bin,sbin}
 ln -sf %{_sbindir}/arping       %{buildroot}/sbin
 ln -sf %{_sbindir}/clockdiff    %{buildroot}/sbin
+ln -sf %{_sbindir}/rarpd        %{buildroot}/sbin
 ln -sf %{_sbindir}/in.rdisc     %{buildroot}/sbin
 ln -sf %{_bindir}/tracepath     %{buildroot}/bin
 ln -sf %{_bindir}/ping          %{buildroot}/bin
@@ -102,7 +113,7 @@ ln -sf %{_bindir}/tracepath6    %{buildroot}/bin
 
 mkdir -p %{buildroot}/%{_mandir}/man8
 # Remove conflicting manpages
-rm doc/tftpd* doc/traceroute* doc/rarpd*
+rm doc/tftpd* doc/traceroute*
 # Install the rest
 install  -m 644 doc/*.8		%{buildroot}%{_mandir}/man8/
 
@@ -121,10 +132,29 @@ install  -m 644 doc/*.8		%{buildroot}%{_mandir}/man8/
 %{_bindir}/tracepath
 %{_bindir}/tracepath6
 %{_sbindir}/in.rdisc
-%{_mandir}/man8/*
 #UsrMerge
-/bin/*
-/sbin/*
+/bin/ping
+/bin/ping6
+/bin/tracepath
+/bin/tracepath6
+/sbin/arping
+/sbin/clockdiff
+/sbin/in.rdisc
+#EndUsrMerge
+%{_mandir}/man8/arping.8%{ext_man}
+%{_mandir}/man8/clockdiff.8%{ext_man}
+%{_mandir}/man8/ninfod.8%{ext_man}
+%{_mandir}/man8/pg3.8%{ext_man}
+%{_mandir}/man8/ping.8%{ext_man}
+%{_mandir}/man8/rdisc.8%{ext_man}
+%{_mandir}/man8/tracepath.8%{ext_man}
 #EndUsrMerge
 
+%files -n rarpd
+%{_sbindir}/rarpd
+#UsrMerge
+/sbin/rarpd
+#EndUsrMerge
+%{_mandir}/man8/rarpd.8%{ext_man}
+
 %changelog