diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 2261880..1aefd5c 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -53,8 +53,13 @@ class puppet::client {
 
     case $::operatingsystem {
         "openbsd": {
+            if versioncmp($::operatingsystemrelease, "5.8") > 0 {
+                $service = "puppetd"
+            } else {
+                $service = "puppet"
+            }
             service { "puppet":
-                name      => "puppetd",
+                name      => $service,
                 ensure    => running,
                 enable    => true,
                 status    => $::puppetversion ? {