diff --git a/nfs/manifests/init.pp b/nfs/manifests/init.pp
index da7cf46..dc8f057 100644
--- a/nfs/manifests/init.pp
+++ b/nfs/manifests/init.pp
@@ -9,6 +9,14 @@ class nfs::client {
         ensure => installed,
     }
 
+    if $::operatingsystem == "Fedora" {
+        # https://bugzilla.redhat.com/show_bug.cgi?id=692008
+        service { "NetworkManager-wait-online":
+            ensure => stopped,
+            enable => true,
+        }
+    }
+
     service { "nfslock":
         name      => $operatingsystem ? {
             "fedora" => "nfs-lock",