diff --git a/nfs-utils-1.3.0.tar.gz b/nfs-utils-1.3.0.tar.gz
deleted file mode 100644
index a85bb24..0000000
--- a/nfs-utils-1.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17b6662df0fe55ef4e14e3c7c59a787dca677079a32abecf9900aa54569dc40e
-size 1073445
diff --git a/nfs-utils-1.3.0.tar.xz b/nfs-utils-1.3.0.tar.xz
new file mode 100644
index 0000000..271cd08
--- /dev/null
+++ b/nfs-utils-1.3.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab8384d0e487ed6a18c5380d5df28015f7dd98680bf08f3247c97d9f7d99e56f
+size 578960
diff --git a/nfs-utils.changes b/nfs-utils.changes
index d2db557..df5d18b 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun 10 07:19:06 UTC 2014 - nfbrown@suse.com
+
+- Use start-statd and rpc-statd.service from upstream for running statd.
+  Our start-statd doesn't work in a systemd environment (bnc#852984)
+- use .xz from upstream, that is what kernel.org prefers and it is smaller
+
 -------------------------------------------------------------------
 Wed Jun  4 01:59:27 UTC 2014 - nfbrown@suse.com
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 9423749..9df5aa2 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -47,7 +47,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %fillup_prereq %insserv_prereq
 %{?systemd_requires}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.gz
+Source0:        http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.xz
 # Download does not work:
 # Source1:        ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2
 Source1:        nfs.doc.tar.bz2
@@ -59,12 +59,11 @@ Source6:        README.NFSv4
 Source7:        fw-client
 Source8:        fw-server
 Source11:       idmapd.conf
-Source12:       start-statd
 Source13:       nfs-utils.rpmlintrc
 Patch0:         nfs-utils-1.0.7-bind-syntax.patch
 # PATCH-FIX-UPSTREAM nfsdcltrack.sbin.patch nfbrown@suse.de
 Patch1:         nfsdcltrack.sbin.patch
-
+Patch2:         start-statd.patch
 Suggests:       python-base
 
 %description
@@ -117,6 +116,7 @@ This package contains additional NFS documentation.
 %setup -q -n nfs-utils-%{version} -a 1
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 cp %{S:6} .
 
 %build
@@ -142,7 +142,8 @@ done
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f linux-nfs/Makefile*
+install -d $RPM_BUILD_ROOT/%{_unitdir}
+install -m 644 systemd/rpc-statd.service $RPM_BUILD_ROOT/%{_unitdir}
 # rc-script
 install -d $RPM_BUILD_ROOT/etc/init.d
 install -m 744 %{SOURCE3} $RPM_BUILD_ROOT/etc/init.d/nfsserver
@@ -165,7 +166,6 @@ touch $RPM_BUILD_ROOT/var/lib/nfs/state
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services
 install -m 0644 %{SOURCE7} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-client
 install -m 0644 %{SOURCE8} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server
-install -m 755 %{S:12} $RPM_BUILD_ROOT/usr/sbin/start-statd
 install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc/nfsmount.conf
 #
 # hack to avoid automatic python dependency
@@ -256,6 +256,7 @@ fi
 /usr/sbin/sm-notify
 /usr/sbin/start-statd
 /usr/sbin/blkmapd
+%{_unitdir}/rpc-statd.service
 %{_mandir}/man5/nfsmount.conf.5.gz
 %{_mandir}/man5/nfs.5.gz
 %{_mandir}/man8/mount.nfs.8.gz
diff --git a/start-statd b/start-statd
deleted file mode 100644
index da42719..0000000
--- a/start-statd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -p
-# nfsmount calls this script when mounting a filesystem with locking
-# enabled, but when statd does not seem to be running (based on
-# /run/rpc.statd.pid).
-# It should run run statd with whatever flags are apropriate for this
-# site.
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-checkproc /usr/sbin/rpc.statd && exit 0
-. /etc/rc.status
-. /etc/sysconfig/nfs
-rc_reset
-echo -n "Starting rpc.statd ..."
-if ! rpcinfo -p localhost >/dev/null 2>/dev/null; then
-	echo -n " ${extd}portmapper not running${norm}"
-	rc_failed 1
-	rc_status -v
-	rc_exit
-fi
-# TODO: write init script and call that one via /sbin/service instead
-start_daemon /usr/sbin/rpc.statd --no-notify $STATD_OPTIONS
-rc_status -v
diff --git a/start-statd.patch b/start-statd.patch
new file mode 100644
index 0000000..0b2b794
--- /dev/null
+++ b/start-statd.patch
@@ -0,0 +1,20 @@
+1/ use correct patch for systemctl
+2/ use correct name for rpc-statd.service
+
+---
+ utils/statd/start-statd |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- nfs-utils-1.3.0.orig/utils/statd/start-statd
++++ nfs-utils-1.3.0/utils/statd/start-statd
+@@ -4,8 +4,8 @@
+ # /var/run/rpc.statd.pid).
+ # It should run statd with whatever flags are apropriate for this
+ # site.
+-PATH=/sbin:/usr/sbin
+-if systemctl start statd.service
++PATH=/bin:/usr/bin:/sbin:/usr/sbin
++if systemctl start rpc-statd.service
+ then :
+ else
+     exec rpc.statd --no-notify