diff --git a/abusehelper/manifests/init.pp b/abusehelper/manifests/init.pp
index b13a814..0fd5b13 100644
--- a/abusehelper/manifests/init.pp
+++ b/abusehelper/manifests/init.pp
@@ -16,4 +16,31 @@ class abusehelper {
         require => Svn::Export["/usr/local/src/abusehelper"],
     }
 
+    include user::system
+    realize(User["abusehel"], Group["abusehel"])
+
+    if $abusehelper_datadir {
+        file { "${abusehelper_datadir}":
+            ensure  => directory,
+            mode    => 0750,
+            owner   => abusehel,
+            group   => abusehel,
+            require => User["abusehel"],
+        }
+
+        file { "/var/lib/ah2":
+            ensure  => link,
+            target  => "${abusehelper_datadir}",
+            require => File["${abusehelper_datadir}"],
+        }
+    } else {
+        file { "/var/lib/ah2":
+            ensure  => directory,
+            mode    => 0750,
+            owner   => abusehel,
+            group   => abusehel,
+            require => User["abusehel"],
+        }
+    }
+
 }