diff --git a/nfs-utils.changes b/nfs-utils.changes
index 41e4285..e37562d 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb 17 03:20:55 UTC 2016 - neilb@suse.com
+
+- nfs.service: don't mount/unmount nfs filesystems.
+  systemd does this automatically.  Trying to do it here too
+  causes timing races (boo#963616)
+
 -------------------------------------------------------------------
 Thu Nov 26 16:17:42 UTC 2015 - schwab@suse.de
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index dfb7564..50a0158 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package nfs-utils
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/nfs.service b/nfs.service
index c843439..ad879f7 100644
--- a/nfs.service
+++ b/nfs.service
@@ -17,8 +17,6 @@ PropagatesReloadTo=nfs-client.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/bin/true
-ExecStartPost=/usr/bin/mount -at nfs,nfs4
-ExecStop=/usr/bin/umount -aft nfs,nfs4
 
 [Install]
 WantedBy=multi-user.target