diff --git a/.cvsignore b/.cvsignore
index ec0110b..0934e30 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-stunnel-4.14.tar.gz
-stunnel-4.14.tar.gz.asc
+stunnel-4.15.tar.gz
+stunnel-4.15.tar.gz.asc
diff --git a/sources b/sources
index 5b4a13f..e59598c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0969cc4868dfd75f22792ecccc9ec555  stunnel-4.14.tar.gz
-99e54fa6cb263ffd29be7a02f4e9b536  stunnel-4.14.tar.gz.asc
+2c00153ad099a5f9c5609e8d1dbbe470  stunnel-4.15.tar.gz
+71ddec1b83133d7479e477ad0ce229c6  stunnel-4.15.tar.gz.asc
diff --git a/stunnel.spec b/stunnel.spec
index 0a77775..d86ef54 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper.
 Name: stunnel
-Version: 4.14
-Release: 3.2
+Version: 4.15
+Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -14,12 +14,12 @@ Source5: stunnel-sfinger.conf
 Source6: pop3-redirect.xinetd
 Source7: stunnel-pop3s-client.conf
 Patch0: stunnel-4.08-authpriv.patch
-Patch1: stunnel-4.12-sample.patch
-Patch2: stunnel-4.14-am_.patch
+Patch1: stunnel-4.15-sample.patch
+Patch2: stunnel-4.15-nogroup.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers, util-linux
-# For stunnel-4.14-am_.patch
+# For stunnel-4.15-nogroup.patch
 BuildRequires: autoconf, automake, libtool
 
 %description
@@ -31,7 +31,7 @@ in conjunction with imapd to create an SSL secure IMAP server.
 %setup -q
 %patch0 -p1 -b .authpriv
 %patch1 -p1 -b .sample
-%patch2 -p1 -b .am_
+%patch2 -p1 -b .nogroup
 
 iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_
 mv doc/stunnel.fr.8_ doc/stunnel.fr.8
@@ -39,13 +39,13 @@ iconv -f iso-8859-2 -t utf-8 < doc/stunnel.pl.8 > doc/stunnel.pl.8_
 mv doc/stunnel.pl.8_ doc/stunnel.pl.8
 
 %build
-autoreconf -f # For stunnel-4.14-am_.patch
+autoreconf -f # For stunnel-4.15-nogroup.patch
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`";
 	LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS
 fi
-%configure --enable-ipv6 --with-threads=pthread \
+%configure --enable-ipv6 \
 	CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{_localstatedir}/run/stunnel.pid\"'"
 make LDADD="-pie -Wl,-z,defs,-z,relro"
 
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Sat Mar 18 2006 Miloslav Trmac <mitr@redhat.com> - 4.15-1
+- Update to stunnel-4.15
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 4.14-3.2
 - bump again for double-long bug on ppc(64)