diff --git a/stunnel/fsl.stunnel b/stunnel/fsl.stunnel
new file mode 100644
index 0000000000..58c5c17b94
--- /dev/null
+++ b/stunnel/fsl.stunnel
@@ -0,0 +1,15 @@
+##
+##  fsl.stunnel -- OSSP fsl configuration
+##
+
+ident (stunnel)/.+ q{
+    prefix(
+        prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+    ) 
+    -> {
+        debug: file(
+            path="@l_prefix@/var/stunnel/stunnel.log",
+            append=1, perm=0644
+        )
+    }
+};
diff --git a/stunnel/rc.stunnel b/stunnel/rc.stunnel
new file mode 100644
index 0000000000..6486ab027e
--- /dev/null
+++ b/stunnel/rc.stunnel
@@ -0,0 +1,23 @@
+#!@l_prefix@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+##  rc.stunnel -- Run-Commands
+##
+
+%config
+    stunnel_enable="yes"
+    stunnel_log_prolog="true"
+    stunnel_log_epilog="true"
+    stunnel_log_numfiles="10"
+    stunnel_log_minsize="1M"
+    stunnel_log_complevel="9"
+
+%daily -u @l_susr@
+    opServiceEnabled stunnel || exit 0
+
+    #   rotate logfile
+    shtool rotate -f \
+        -n${stunnel_log_numfiles} -s${stunnel_log_minsize} -d \
+        -z${stunnel_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
+        -P "${stunnel_log_prolog}" \
+        -E "${stunnel_log_epilog}" \
+        @l_prefix@/var/stunnel/stunnel.log
diff --git a/stunnel/stunnel.spec b/stunnel/stunnel.spec
index f1e0629b67..35baccbf5d 100644
--- a/stunnel/stunnel.spec
+++ b/stunnel/stunnel.spec
@@ -33,25 +33,34 @@ Distribution: OpenPKG [BASE]
 Group:        Network
 License:      GPL
 Version:      4.04
-Release:      20030322
+Release:      20030703
+
+#   package options
+%option       with_fsl  yes
 
 #   list of sources
 Source0:      http://www.stunnel.org/download/stunnel/src/stunnel-%{version}.tar.gz
 Source1:      stunnel.pem
+Source2:      rc.stunnel
+Source3:      fsl.stunnel
 Patch0:       http://www.stunnel.org/patches/patches/blinding-4.x_bri.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, openssl, gcc, make
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20030415, openssl, gcc, make
+PreReq:       OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq:  fsl
+PreReq:       fsl
+%endif
 AutoReq:      no
 AutoReqProv:  no
 
 %description
     The Stunnel program is designed to work as SSL encryption wrapper
     between remote client and local (inetd-startable) or remote server.
-    The concept is that having non-SSL aware dae- mons running on your
+    The concept is that having non-SSL aware daemons running on your
     system you can easily setup them to communicate with clients over
     secure SSL channel. Stunnel can be used to add SSL functionality
     to commonly used inetd daemons like POP-2, POP-3 and IMAP servers
@@ -64,6 +73,8 @@ AutoReqProv:  no
 %build
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
+    LDFLAGS="%{l_fsl_ldflags}" \
+    LIBS="%{l_fsl_libs}" \
     ./configure \
         --prefix=%{l_prefix} \
         --with-ssl=%{l_prefix} \
@@ -73,12 +84,36 @@ AutoReqProv:  no
 
 %install
     rm -rf $RPM_BUILD_ROOT
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
     %{l_make} %{l_mflags} install prefix=$RPM_BUILD_ROOT%{l_prefix}
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
     mv $RPM_BUILD_ROOT%{l_prefix}/etc/stunnel/stunnel.conf-sample \
        $RPM_BUILD_ROOT%{l_prefix}/etc/stunnel/stunnel.conf
     strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+
+    #   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' \
+        -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}'
 
 %files -f files