diff --git a/recipes-security/samhain/samhain-client_4.1.0.bb b/recipes-security/samhain/samhain-client_4.1.0.bb
index c671b48..bb47449 100644
--- a/recipes-security/samhain/samhain-client_4.1.0.bb
+++ b/recipes-security/samhain/samhain-client_4.1.0.bb
@@ -8,7 +8,8 @@ EXTRA_OECONF += " \
         --with-logserver=${SAMHAIN_SERVER} \
         --with-port=${SAMHAIN_PORT} \
         --with-config-file=/etc/samhainrc \
-        --with-data-file=/var/lib/samhain/samhain_file \
+        --with-data-file=/var/samhain/samhain.data \
+        --with-pid-file=/var/samhain/samhain.pid \
         "
 
 
diff --git a/recipes-security/samhain/samhain.inc b/recipes-security/samhain/samhain.inc
index b73a3a2..8114f42 100644
--- a/recipes-security/samhain/samhain.inc
+++ b/recipes-security/samhain/samhain.inc
@@ -87,4 +87,5 @@ do_install_append () {
 	install -d ${D}${docdir}/${PN}
 	cp -r docs/* ${D}${docdir}/${PN}
 	cp -r scripts ${D}${docdir}/${PN}
+    install -d -m 755 ${D}/var/samhain
 }