diff --git a/puppet/files/puppetd.rc b/puppet/files/puppetd.rc
new file mode 100644
index 0000000..19d0e8f
--- /dev/null
+++ b/puppet/files/puppetd.rc
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# OpenBSD init script for puppetd.
+
+daemon="/usr/local/sbin/puppetd"
+
+. /etc/rc.d/rc.subr
+
+pexp=".*ruby.* ${daemon}${daemon_flags:+ ${daemon_flags}}"
+rc_reload=NO
+
+rc_cmd $1
diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 00c775e..88b7884 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -31,6 +31,18 @@ class puppet::client {
                 before => Service["puppet"],
             }
         }
+        openbsd: {
+            if $operatingsystemrelease == "4.9" {
+                file { "/etc/rc.d/puppetd":
+                    ensure => present,
+                    source => "puppet:///modules/puppet/puppetd.rc",
+                    mode   => 0755,
+                    owner  => "root",
+                    group  => "wheel",
+                    before => Service["puppet"],
+                }
+            }
+        }
     }
         
     file { "/etc/puppet/puppet.conf":