diff --git a/manifests/init.pp b/manifests/init.pp
index 6f06609..27eefd6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -150,8 +150,12 @@
     # we need the software before running a service
     Class['lumberjack::package'] -> Class['lumberjack::config']
 
-    Class['lumberjack::config']  -> Class['lumberjack::service']
-    Class['lumberjack::package'] -> Class['lumberjack::service']
+    # make sure configuration changes properly restart the daemon
+    if ($status in [ 'enabled', 'running' ]) {
+      Class['lumberjack::config']  ~> Class['lumberjack::service']
+    } else {
+      Class['lumberjack::config']  -> Class['lumberjack::service']
+    }
 
   } else {
 
diff --git a/manifests/params.pp b/manifests/params.pp
index b869f2c..2309e5d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -43,12 +43,12 @@
   #### Internal module values
 
   # packages
-  case $::operatingsystem {
-    'CentOS', 'Fedora', 'Scientific': {
+  case $::osfamily {
+    'RedHat': {
       # main application
       $package = [ 'lumberjack' ]
     }
-    'Debian', 'Ubuntu': {
+    'Debian': {
       # main application
       $package = [ 'lumberjack' ]
     }
@@ -59,14 +59,14 @@
   }
 
   # service parameters
-  case $::operatingsystem {
-    'CentOS', 'Fedora', 'Scientific': {
+  case $::osfamily {
+    'RedHat': {
       $service_name       = 'lumberjack'
       $service_hasrestart = true
       $service_hasstatus  = true
       $service_pattern    = $service_name
     }
-    'Debian', 'Ubuntu': {
+    'Debian': {
       $service_name       = 'lumberjack'
       $service_hasrestart = true
       $service_hasstatus  = true