diff --git a/SOURCES/rpcbind.service b/SOURCES/rpcbind.service
index 04b733e..1ca83a4 100644
--- a/SOURCES/rpcbind.service
+++ b/SOURCES/rpcbind.service
@@ -4,8 +4,8 @@ DefaultDependencies=no
 
 # Make sure we use the IP addresses listed for
 # rpcbind.socket, no matter how this unit is started.
-Wants=rpcbind.socket
-After=rpcbind.socket
+Requires=rpcbind.socket
+Wants=rpcbind.target
 After=systemd-tmpfiles-setup.service
 
 [Service]
diff --git a/SOURCES/rpcbind.socket b/SOURCES/rpcbind.socket
index d63c1d9..814e143 100644
--- a/SOURCES/rpcbind.socket
+++ b/SOURCES/rpcbind.socket
@@ -4,5 +4,12 @@ Description=RPCbind Server Activation Socket
 [Socket]
 ListenStream=/var/run/rpcbind.sock
 
+# RPC netconfig can't handle ipv6/ipv4 dual sockets
+BindIPv6Only=ipv6-only
+ListenStream=0.0.0.0:111
+ListenDatagram=0.0.0.0:111
+ListenStream=[::]:111
+ListenDatagram=[::]:111
+
 [Install]
 WantedBy=sockets.target
diff --git a/SPECS/rpcbind.spec b/SPECS/rpcbind.spec
index 052f588..0840f0e 100644
--- a/SPECS/rpcbind.spec
+++ b/SPECS/rpcbind.spec
@@ -1,10 +1,10 @@
 Name:           rpcbind
 Version:        0.2.0
-Release:        44%{?dist}
+Release:        47%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        BSD
-URL:            http://nfsv4.bullopensource.org
+URL:            http://git.linux-nfs.org/?p=steved/rpcbind.git;a=summary
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 Source0:        http://downloads.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2
@@ -197,6 +197,15 @@ fi
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
+* Sat Aug 25 2018 Steve Dickson <steved@redhat.com> - 0.2.0-47
+- rpcbind.service: Not pulling the rpcbind.target (bz 1613210)
+
+* Mon Aug 20 2018 Steve Dickson <steved@redhat.com> - 0.2.0-46
+- Updated the upsteam URL (bz 1583921)
+
+* Thu Apr 19 2018 Steve Dickson <steved@redhat.com> - 0.2.0-45
+- Added back the ListenStream stanzas from rpcbind.socket (bz 1530721)
+
 * Fri Jan  5 2018 Steve Dickson <steved@redhat.com> - 0.2.0-44
 * Removed ListenStream stanzas from rpcbind.socket (bz 1425758)