--- tools/stunnel.conf-sample.in.orig	Thu Sep 22 10:11:48 2005
+++ tools/stunnel.conf-sample.in	Sat Oct 22 19:45:44 2005
@@ -1,17 +1,18 @@
 ; Sample stunnel configuration file by Michal Trojnara 2002-2005
+# Modified for OpenBSD by Michael Schubert 2003
 ; Some options used here may not be adequate for your particular configuration
 ; Please make sure you understand them (especially the effect of chroot jail)
 
 ; Certificate/key is needed in server mode and optional in client mode
-cert = @prefix@/etc/stunnel/mail.pem
-;key = @prefix@/etc/stunnel/mail.pem
+cert = @sysconfdir@/ssl/private/stunnel.pem
+;key = @sysconfdir@/ssl/etc/mail.pem
 
 ; Some security enhancements for UNIX systems - comment them out on Win32
-chroot = @prefix@/var/stunnel/
-setuid = nobody
-setgid = nogroup
+chroot = /var/stunnel/
+setuid = _stunnel
+setgid = _stunnel
 ; PID is created inside chroot jail
-pid = /stunnel.pid
+pid = /var/run/stunnel.pid
 
 ; Some performance tunings
 socket = l:TCP_NODELAY=1
@@ -27,12 +28,12 @@
 ; CApath is located inside chroot jail
 ;CApath = /certs
 ; It's often easier to use CAfile
-;CAfile = @prefix@/etc/stunnel/certs.pem
+;CAfile = @sysconfdir@/ssl/certs.pem
 ; Don't forget to c_rehash CRLpath
 ; CRLpath is located inside chroot jail
 ;CRLpath = /crls
 ; Alternatively you can use CRLfile
-;CRLfile = @prefix@/etc/stunnel/crls.pem
+;CRLfile = @sysconfdir@/ssl/crls.pem
 
 ; Some debugging stuff useful for troubleshooting
 ;debug = 7
