diff --git a/0027-socket-before-service.patch b/0027-socket-before-service.patch
new file mode 100644
index 0000000..af0a515
--- /dev/null
+++ b/0027-socket-before-service.patch
@@ -0,0 +1,37 @@
+Ignore exit state of two and also be sure that rpcbind.service will
+trigger rpcbind.socket before its own start which the fulfill rpcbind.target
+
+References: bnc#870158, bnc#860246
+Signed-off-by: Werner Fink <werner@suse.de>
+
+---
+ systemd/rpcbind.service.in |    3 +++
+ systemd/rpcbind.socket     |    1 +
+ 2 files changed, 4 insertions(+)
+
+--- rpcbind-0.2.1_rc4/systemd/rpcbind.service.in
++++ rpcbind-0.2.1_rc4/systemd/rpcbind.service.in	2014-03-31 10:29:29.262735423 +0000
+@@ -1,11 +1,14 @@
+ [Unit]
+ Description=RPC Bind
++Documentation=man:rpcbind(8)
+ DefaultDependencies=no
++Requires=rpcbind.socket
+ 
+ [Service]
+ Type=notify
+ EnvironmentFile=-/etc/sysconfig/rpcbind
+ ExecStart=@bindir@/rpcbind $RPCBIND_OPTIONS -w -f
++SuccessExitStatus=2
+ 
+ [Install]
+ WantedBy=multi-user.target
+--- rpcbind-0.2.1_rc4/systemd/rpcbind.socket
++++ rpcbind-0.2.1_rc4/systemd/rpcbind.socket	2014-03-31 10:30:12.799480612 +0000
+@@ -1,5 +1,6 @@
+ [Unit]
+ Description=RPCbind Server Activation Socket
++Documentation=man:rpcbind(8)
+ DefaultDependencies=no
+ Wants=rpcbind.target
+ Before=rpcbind.target
diff --git a/rpcbind.changes b/rpcbind.changes
index 750df1b..ef33300 100644
--- a/rpcbind.changes
+++ b/rpcbind.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Mar 31 10:38:40 UTC 2014 - werner@suse.de
+
+- Add 0027-socket-before-service.patch to make sure that always
+  the socket is up before the service.  This will make sure that
+  rpcbind.target will not only cause the socket but also the
+  rpcbind.service (bnc#860246)
+- Beside this ingnore exit state 2 in case of shutdown (bnc#860246)
+
 -------------------------------------------------------------------
 Wed Mar 26 21:52:19 UTC 2014 - nfbrown@suse.com
 
diff --git a/rpcbind.spec b/rpcbind.spec
index 5a93bfc..2d89418 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -62,6 +62,7 @@ Patch22:        0023-Make-rpcinfo-p-support-IPv6-addresses-too.patch
 Patch23:        0024-rpcinfo-remove-obsolete-function-get_inet_address.patch
 Patch24:        0025-rpcinfo-warmstat_no-warning-about-missing-file.patch
 Patch25:        0026-systemd-no-default-dep
+Patch26:        0027-socket-before-service.patch
 
 %define statefile /var/lib/portmap.state
 BuildRequires:  pkgconfig(systemd)
@@ -104,6 +105,7 @@ cp %{SOURCE4} .
 %patch23 -p1
 %patch24 -p0
 %patch25 -p1
+%patch26 -p1
 
 %build
 autoreconf -fiv