diff --git a/nfs-utils.changes b/nfs-utils.changes
index d384e47..77d977a 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Aug 10 04:28:42 UTC 2015 - nfbrown@suse.com
+
+- nfs.service: improve back-compatibility with /etc/init.d/nfs
+ + mount and unmount nfs filesystems on start/stop.
+ + keep status as "good" when everything is running.
+ (bnc#911986)
+
 -------------------------------------------------------------------
 Sun Nov 09 19:34:00 UTC 2014 - Led <ledest@gmail.com>
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 775249a..45c0f2a 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package nfs-utils
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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 efd25c0..c843439 100644
--- a/nfs.service
+++ b/nfs.service
@@ -15,7 +15,10 @@ PropagatesReloadTo=nfs-client.target
 
 [Service]
 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