diff --git a/samhain/fsl.samhain b/samhain/fsl.samhain
new file mode 100644
index 0000000000..d852996938
--- /dev/null
+++ b/samhain/fsl.samhain
@@ -0,0 +1,15 @@
+##
+##  fsl.samhain -- OSSP fsl configuration
+##
+
+ident (Yule|Samhain)/.+ q{
+    prefix(
+        prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+    ) 
+    -> {
+        debug: file(
+            path="@l_prefix@/var/samhain/samhain.log",
+            append=1, perm=0644
+        )
+    }
+};
diff --git a/samhain/rc.samhain b/samhain/rc.samhain
index 9ea3a234eb..dae55c6b34 100644
--- a/samhain/rc.samhain
+++ b/samhain/rc.samhain
@@ -5,6 +5,11 @@
 
 %config
     samhain_enable="yes"
+    samhain_log_prolog="true"
+    samhain_log_epilog="true"
+    samhain_log_numfiles="10"
+    samhain_log_minsize="1M"
+    samhain_log_complevel="9"
 
 %start -p 200 -u @l_susr@
     opServiceEnabled samhain || exit 0
@@ -16,3 +21,13 @@
         kill -TERM `cat @l_prefix@/var/samhain/samhain.pid`
     fi
 
+%daily -u @l_susr@
+    opServiceEnabled samhain || exit 0
+
+    #   rotate logfile
+    shtool rotate -f \
+        -n${samhain_log_numfiles} -s${samhain_log_minsize} -d \
+        -z${samhain_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
+        -P "${samhain_log_prolog}" \
+        -E "${samhain_log_epilog}" \
+        @l_prefix@/var/samhain/samhain.log
diff --git a/samhain/samhain.spec b/samhain/samhain.spec
index c55da6c9c9..fa2b139165 100644
--- a/samhain/samhain.spec
+++ b/samhain/samhain.spec
@@ -33,17 +33,25 @@ Distribution: OpenPKG [PLUS]
 Group:        System
 License:      GPL
 Version:      1.7.9
-Release:      20030702
+Release:      20030703
+
+#   package options
+%option       with_fsl  yes
 
 #   list of sources
 Source0:      http://la-samhna.de/samhain/samhain-current.tar.gz
 Source1:      rc.samhain
+Source2:      fsl.samhain
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020826, gcc
-PreReq:       OpenPKG, openpkg >= 20020826
+BuildPreReq:  OpenPKG, openpkg >= 20030415, gcc
+PreReq:       OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq:  fsl
+PreReq:       fsl
+%endif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -67,6 +75,8 @@ AutoReqProv:  no
     esac
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
+    LDFLAGS="%{l_fsl_ldflags}" \
+    LIBS="%{l_fsl_libs}" \
     ./configure \
         --prefix=%{l_prefix} \
         --mandir=%{l_prefix}/man \
@@ -85,6 +95,8 @@ AutoReqProv:  no
 
 %install
     rm -rf $RPM_BUILD_ROOT
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
     ( cd samhain-%{version}
       %{l_make} %{l_mflags} \
           install-program install-man install-data \
@@ -100,14 +112,29 @@ AutoReqProv:  no
     %{l_shtool} install -c -m 644 \
         samhain-%{version}/$rc \
         $RPM_BUILD_ROOT%{l_prefix}/etc/samhain/samhainrc
+
+    #   Creating run-command script
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};g' \
-        %{SOURCE rc.samhain} \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+        -e 's;@l_susr@;%{l_susr};g' \
+        -e 's;@l_rusr@;%{l_rusr};g' \
+        -e 's;@l_rgrp@;%{l_rgrp};g' \
+        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+    #   OSSP fake syslog library
+    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+    %{l_shtool} install -c -m 644 \
+        -e 's;@l_prefix@;%{l_prefix};g' \
+        %{SOURCE fsl.%{name}} \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+    #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
+        '%not %dir %{l_prefix}/etc/fsl' \
+        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
         '%config %{l_prefix}/etc/samhain/samhainrc'
 
 %files -f files