diff --git a/nfs-utils.changes b/nfs-utils.changes
index 63e483d..d4206f6 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Sep  5 05:05:13 UTC 2013 - nfbrown@suse.com
+
+- nfs.init: always start gssd.
+  Recent kernel change means that if gssd isn't running
+  and NFSv4 mount will wait 15 seconds before timing out
+  even if gss security wasn't requested.
+  So just start gssd alway - there is no significant cost
+  in this.
+  (bnc#837262)
+
 -------------------------------------------------------------------
 Mon Sep  2 05:13:25 UTC 2013 - nfbrown@suse.com
 
diff --git a/nfs.init b/nfs.init
index 26a1465..c0bd50d 100644
--- a/nfs.init
+++ b/nfs.init
@@ -37,7 +37,8 @@ if [ -z "$RPC_PIPEFS_DIR" ]; then
 fi
 
 NEED_IDMAPD=no
-NEED_GSSD=no
+#always start gssd, else kernel waits for it.
+NEED_GSSD=yes
 NEED_LDCONFIG=no
 state=0
 usr=""