diff --git a/psacct/manifests/init.pp b/psacct/manifests/init.pp
index 345b09d..610921b 100644
--- a/psacct/manifests/init.pp
+++ b/psacct/manifests/init.pp
@@ -23,20 +23,15 @@ class psacct {
 class psacct::linux {
 
     package { "psacct":
+        ensure => installed,
         name   => $::operatingsystem ? {
             "debian" => "acct",
             "ubuntu" => "acct",
             default  => "psacct",
         },
-        ensure => installed,
     }
 
     service { "psacct":
-        name      => $::operatingsystem ? {
-            "debian" => "acct",
-            "ubuntu" => "acct",
-            default  => "psacct",
-        },
         ensure    => $::operatingsystem ? {
             "debian" => undef,
             "ubuntu" => undef,
@@ -44,6 +39,11 @@ class psacct::linux {
         },
         enable    => true,
         hasstatus => true,
+        name      => $::operatingsystem ? {
+            "debian" => "acct",
+            "ubuntu" => "acct",
+            default  => "psacct",
+        },
         require   => Package["psacct"],
     }
 
@@ -54,9 +54,16 @@ class psacct::linux {
 #
 class psacct::openbsd {
 
+    file { "/var/account":
+        ensure => directory,
+        mode   => "0750",
+        owner  => "root",
+        group  => "wheel",
+    }
+
     file { "/var/account/acct":
         ensure => present,
-        mode   => "0644",
+        mode   => "0640",
         owner  => "root",
         group  => "wheel",
         notify => Exec["accton"],