diff --git a/syslog/manifests/init.pp b/syslog/manifests/init.pp
index f61a268..fb2c58b 100644
--- a/syslog/manifests/init.pp
+++ b/syslog/manifests/init.pp
@@ -10,6 +10,9 @@
 #       Group name which has permissions to read logs. Defaults to
 #       wheel or root depending on operating system.
 #
+#   $syslog_resolve_names:
+#       Resolve DNS names for remote messages if "true". Defaults to "false".
+#
 class syslog::common {
 
     if !$syslog_type {
@@ -36,6 +39,10 @@ class syslog::common {
         }
     }
 
+    if ! $syslog_resolve_names {
+        $syslog_resolve_names = "false"
+    }
+
     case $kernel {
         "linux": {
             file { "/etc/logrotate.d/syslog.all":
@@ -186,13 +193,13 @@ class syslog::client::rsyslog {
 
     if $::operatingsystem == "OpenBSD" {
         file { "/etc/rc.d/syslogd":
-            ensure => present,
-            mode   => "0555",
-            owner  => "root",
-            group  => "wheel",
-            source => "puppet:///modules/syslog/rsyslogd.rc",
-            backup => ".orig",
-            before => Service["rsyslog"],
+            ensure  => present,
+            mode    => "0555",
+            owner   => "root",
+            group   => "wheel",
+            content => template("syslog/rsyslogd.rc.erb"),
+            backup  => ".orig",
+            before  => Service["rsyslog"],
         }
         Service["rsyslog"] {
             name => "syslogd",
diff --git a/syslog/files/rsyslogd.rc b/syslog/templates/rsyslogd.rc.erb
old mode 100755
new mode 100644
similarity index 60%
rename from syslog/files/rsyslogd.rc
rename to syslog/templates/rsyslogd.rc.erb
index a50f795..d3e68e3
--- a/syslog/files/rsyslogd.rc
+++ b/syslog/templates/rsyslogd.rc.erb
@@ -1,7 +1,11 @@
 #!/bin/sh
 
 daemon="/usr/local/sbin/rsyslogd"
+<% if @syslog_resolve_names == "true" -%>
+daemon_flags="-c 4 -i /var/run/syslog.pid"
+<% else -%>
 daemon_flags="-x -c 4 -i /var/run/syslog.pid"
+<% end -%>
 
 . /etc/rc.d/rc.subr