diff --git a/.cvsignore b/.cvsignore
index 7c013bc..525a23e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-stunnel-4.11.tar.gz
-stunnel-4.11.tar.gz.asc
+stunnel-4.12.tar.gz
+stunnel-4.12.tar.gz.asc
diff --git a/sources b/sources
index cb7a1b5..3fb2fe7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-253c50435d4d81cba6f19ca34266e6dc  stunnel-4.11.tar.gz
-a8674e178ef42330dea442a72f258518  stunnel-4.11.tar.gz.asc
+0eaef6573d5fb96021d5a003fc0c7d91  stunnel-4.12.tar.gz
+a69b3551a39c5cbe6a289eed22a2e415  stunnel-4.12.tar.gz.asc
diff --git a/stunnel.spec b/stunnel.spec
index 3ec6f82..285a2ea 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper.
 Name: stunnel
-Version: 4.11
-Release: 2
+Version: 4.12
+Release: 0.testcompile
 License: GPL
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -14,7 +14,7 @@ Source5: stunnel-sfinger.conf
 Source6: pop3-redirect.xinetd
 Source7: stunnel-pop3s-client.conf
 Patch0: stunnel-4.08-authpriv.patch
-Patch1: stunnel-4.08-sample.patch
+Patch1: stunnel-4.12-sample.patch
 Patch2: stunnel-4.11-printf.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
@@ -29,7 +29,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 .printf
+#patch2 -p1 -b .printf
 
 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
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Fri Sep 30 2005 Miloslav Trmac <mitr@redhat.com> - 4.12-1
+- Update to stunnel-4.12
+
 * Thu Sep 22 2005 Miloslav Trmac <mitr@redhat.com> - 4.11-2
 - Enable IPv6 (#169050, patch by Peter Bieringer)
 - Don't ship another copy of man pages in HTML