diff --git a/nfs/manifests/init.pp b/nfs/manifests/init.pp
index f4bab7a..3116bed 100644
--- a/nfs/manifests/init.pp
+++ b/nfs/manifests/init.pp
@@ -9,7 +9,7 @@ class nfs::client {
         ensure => installed,
     }
 
-    if $::operatingsystem == "Fedora" {
+    if $::operatingsystem == "Fedora" and $::operatingsystemrelease >= 16 {
         # https://bugzilla.redhat.com/show_bug.cgi?id=692008
         service { "NetworkManager-wait-online":
             ensure => stopped,
@@ -19,7 +19,10 @@ class nfs::client {
 
     service { "nfslock":
         name      => $::operatingsystem ? {
-            "fedora" => "nfs-lock",
+            "fedora" => $::operatingsystemrelease ? {
+                /^([1-9]|1[0-5])$/ => "nfslock",
+                default            => "nfs-lock",
+            },
             default  => "nfslock",
         },
         ensure    => running,