diff -Naurp stunnel-4.26/src/Makefile.am stunnel-4.26.oden/src/Makefile.am
--- stunnel-4.26/src/Makefile.am	2008-09-20 22:32:18.000000000 +0200
+++ stunnel-4.26.oden/src/Makefile.am	2008-12-17 18:51:38.000000000 +0100
@@ -27,7 +27,7 @@ INCLUDES = -I/usr/kerberos/include
 
 # Additional compiler flags
 
-AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
+AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/ssl/stunnel"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
 
 # Win32 executable
 
diff -Naurp stunnel-4.26/src/Makefile.in stunnel-4.26.oden/src/Makefile.in
--- stunnel-4.26/src/Makefile.in	2008-09-20 22:32:20.000000000 +0200
+++ stunnel-4.26.oden/src/Makefile.in	2008-12-17 18:51:38.000000000 +0100
@@ -224,7 +224,7 @@ libstunnel_la_LDFLAGS = -avoid-version
 INCLUDES = -I/usr/kerberos/include
 
 # Additional compiler flags
-AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
+AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/ssl/stunnel"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
 
 # Win32 executable
 EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak nogui.c os2.mak
diff -Naurp stunnel-4.26/tools/Makefile.am stunnel-4.26.oden/tools/Makefile.am
--- stunnel-4.26/tools/Makefile.am	2008-09-20 22:31:07.000000000 +0200
+++ stunnel-4.26.oden/tools/Makefile.am	2008-12-17 18:51:38.000000000 +0100
@@ -3,7 +3,7 @@
 EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh \
 	stunnel.spec stunnel.cnf stunnel.nsi stunnel.conf
 
-confdir = $(sysconfdir)/stunnel
+confdir = $(sysconfdir)/ssl/stunnel
 conf_DATA = stunnel.conf-sample
 
 docdir = $(datadir)/doc/stunnel
diff -Naurp stunnel-4.26/tools/stunnel.conf-sample.in stunnel-4.26.oden/tools/stunnel.conf-sample.in
--- stunnel-4.26/tools/stunnel.conf-sample.in	2007-11-02 19:22:32.000000000 +0100
+++ stunnel-4.26.oden/tools/stunnel.conf-sample.in	2008-12-17 18:51:38.000000000 +0100
@@ -3,14 +3,14 @@
 ; 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/stunnel/mail.pem
+;key = @sysconfdir@/ssl/stunnel/mail.pem
 
 ; Protocol version (all, SSLv2, SSLv3, TLSv1)
 sslVersion = SSLv3
 
 ; Some security enhancements for UNIX systems - comment them out on Win32
-chroot = @prefix@/var/lib/stunnel/
+chroot = @localstatedir@/lib/stunnel/
 setuid = nobody
 setgid = @DEFAULT_GROUP@
 ; PID is created inside chroot jail
@@ -30,12 +30,12 @@ socket = r:TCP_NODELAY=1
 ; CApath is located inside chroot jail
 ;CApath = /certs
 ; It's often easier to use CAfile
-;CAfile = @prefix@/etc/stunnel/certs.pem
+;CAfile = @sysconfdir@/ssl/stunnel/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/stunnel/crls.pem
 
 ; Some debugging stuff useful for troubleshooting
 ;debug = 7