diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 5f8502b..c7d20ad 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -47,17 +47,16 @@ class puppet::client {
     case $operatingsystem {
         openbsd: {
             service { "puppet":
-                name      => "puppetd",
+                name      => $operatingsystemrelease ? {
+                    /4\.[1-8]/ => "puppet",
+                    default    => "puppetd",
+                },
                 ensure    => running,
                 enable    => true,
-                start     => $operatingsystemrelease ? {
-                    /4\.[1-6]/ => "/usr/local/bin/puppetd",
-                    default    => "/usr/local/sbin/puppetd",
-                },
-                restart   => $operatingsystemrelease ? {
-                    /4\.[1-6]/ => "/usr/bin/pkill -HUP -f /usr/local/bin/puppetd",
-                    default    => "/usr/bin/pkill -HUP -f /usr/local/sbin/puppetd",
-                },
+                start     => "/usr/local/sbin/puppetd",
+                stop      => "pkill -f /usr/local/sbin/puppetd",
+                status    => "pgrep -f /usr/local/sbin/puppetd",
+                restart   => "pkill -HUP -f /usr/local/sbin/puppetd",
                 subscribe => File["/etc/puppet/puppet.conf"],
             }
         }