diff --git a/SOURCES/rpcbind.service b/SOURCES/rpcbind.service
index b8eaab9..04b733e 100644
--- a/SOURCES/rpcbind.service
+++ b/SOURCES/rpcbind.service
@@ -1,6 +1,11 @@
 [Unit]
 Description=RPC bind service
-Requires=rpcbind.socket
+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
 After=systemd-tmpfiles-setup.service
 
 [Service]
@@ -9,4 +14,4 @@ EnvironmentFile=/etc/sysconfig/rpcbind
 ExecStart=/sbin/rpcbind -w $RPCBIND_ARGS
 
 [Install]
-Also=rpcbind.socket
+WantedBy=multi-user.target
diff --git a/SOURCES/rpcbind.socket b/SOURCES/rpcbind.socket
index 9fc80b6..d63c1d9 100644
--- a/SOURCES/rpcbind.socket
+++ b/SOURCES/rpcbind.socket
@@ -3,9 +3,6 @@ Description=RPCbind Server Activation Socket
 
 [Socket]
 ListenStream=/var/run/rpcbind.sock
-ListenStream=[::]:111
-ListenStream=0.0.0.0:111
-BindIPv6Only=ipv6-only
 
 [Install]
 WantedBy=sockets.target
diff --git a/SPECS/rpcbind.spec b/SPECS/rpcbind.spec
index ab59da0..052f588 100644
--- a/SPECS/rpcbind.spec
+++ b/SPECS/rpcbind.spec
@@ -1,6 +1,6 @@
 Name:           rpcbind
 Version:        0.2.0
-Release:        42%{?dist}
+Release:        44%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        BSD
@@ -197,6 +197,12 @@ fi
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
+* Fri Jan  5 2018 Steve Dickson <steved@redhat.com> - 0.2.0-44
+* Removed ListenStream stanzas from rpcbind.socket (bz 1425758)
+
+* Wed Oct 25 2017 Steve Dickson <steved@redhat.com> - 0.2.0-43
+- Updated rpcbind.service to upstream version (bz 1425663)
+
 * Tue May 30 2017 Steve Dickson <steved@redhat.com> - 0.2.0-42
 - Stop freeing static memory (bz 1454876)