diff --git a/kerberos/manifests/init.pp b/kerberos/manifests/init.pp
index fb72f7e..f1ca309 100644
--- a/kerberos/manifests/init.pp
+++ b/kerberos/manifests/init.pp
@@ -18,26 +18,30 @@
 #
 class kerberos::client {
 
-    case $operatingsystem {
-        centos,fedora: {
+    case $::operatingsystem {
+        "centos","fedora": {
             package { "krb5-workstation":
                 ensure => installed,
             }
         }
+        "openbsd": {}
+        default: {
+            fail("kerberos::client not supported in ${::operatingsystem}")
+        }
     }
 
     file { "krb5.conf":
-        path    => $operatingsystem ? {
-            openbsd => "/etc/kerberosV/krb5.conf",
-            default => "/etc/krb5.conf",
-        },
         ensure  => present,
+        path    => $::operatingsystem ? {
+            "openbsd" => "/etc/kerberosV/krb5.conf",
+            default   => "/etc/krb5.conf",
+        },
         content => template("kerberos/krb5.conf.erb"),
         mode    => "0644",
         owner   => "root",
-        group   => $operatingsystem ? {
-            openbsd => "wheel",
-            default => "root",
+        group   => $::operatingsystem ? {
+            "openbsd" => "wheel",
+            default   => "root",
         },
     }
 
@@ -66,7 +70,7 @@ class kerberos::auth {
     include kerberos::client
     $kdclist = inline_template('<%= kerberos_kdc.join(" ") -%>')
 
-    case $operatingsystem {
+    case $::operatingsystem {
         "centos","fedora": {
             package { "pam_krb5":
                 ensure => installed,
@@ -79,7 +83,7 @@ class kerberos::auth {
             }
         }
         default: {
-            fail("kerberos::auth not supported on ${operatingsystem}")
+            fail("kerberos::auth not supported on ${::operatingsystem}")
         }
     }
 }
@@ -96,7 +100,9 @@ class kerberos::auth {
 #       Directory where to store Kerberos database files
 #       defaults to /srv/kerberos
 #
-class kerberos::server inherits kerberos::client {
+class kerberos::server {
+
+    require kerberos::client
 
     package { "krb5-server":
         ensure => installed,
@@ -131,8 +137,7 @@ class kerberos::server inherits kerberos::client {
         mode    => "0600",
         owner   => "root",
         group   => "root",
-        require => [ Package["krb5-server"],
-                     File["/srv/kerberos"], ],
+        require => [ Package["krb5-server"], File["/srv/kerberos"], ],
         notify  => Service["krb5kdc"],
     }
 
@@ -181,7 +186,7 @@ class kerberos::server::ldap inherits kerberos::server {
 
     File["/var/kerberos/krb5kdc/kdc.conf"] {
         content => template("kerberos/kdc-ldap.conf.erb"),
-    }    
+    }
 
 }
 
@@ -214,9 +219,9 @@ define kerberos::keytab($principals = [], $ensure = present, $owner = "root", $g
 
     case $group {
         "": {
-            case $operatingsystem {
-                openbsd: { $real_group = "wheel" }
-                default: { $real_group = "root" }
+            case $::operatingsystem {
+                "openbsd": { $real_group = "wheel" }
+                default:   { $real_group = "root" }
             }
         }
         default: {