diff --git a/.cvsignore b/.cvsignore
index fbb1d32..ec0110b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-stunnel-4.13.tar.gz
-stunnel-4.13.tar.gz.asc
+stunnel-4.14.tar.gz
+stunnel-4.14.tar.gz.asc
diff --git a/sources b/sources
index b76641c..5b4a13f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d06383b49d8da71ca0b7f46caff90bde  stunnel-4.13.tar.gz
-1decffa51589673d8eaf2befdaa0fad9  stunnel-4.13.tar.gz.asc
+0969cc4868dfd75f22792ecccc9ec555  stunnel-4.14.tar.gz
+99e54fa6cb263ffd29be7a02f4e9b536  stunnel-4.14.tar.gz.asc
diff --git a/stunnel.spec b/stunnel.spec
index 1487e10..a647be1 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,6 +1,6 @@
 Summary: An SSL-encrypting socket wrapper.
 Name: stunnel
-Version: 4.13
+Version: 4.14
 Release: 1
 License: GPL
 Group: Applications/Internet
@@ -15,9 +15,12 @@ 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
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers, util-linux
+# For stunnel-4.14-am_.patch
+BuildRequires: autoconf, automake, libtool
 
 %description
 Stunnel is a socket wrapper which can provide SSL (Secure Sockets
@@ -28,6 +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_
 
 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
@@ -35,12 +39,14 @@ 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
 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
+%configure --enable-ipv6 \
+	CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{_localstatedir}/run/stunnel.pid\"'"
 make LDADD="-pie -Wl,-z,defs,-z,relro"
 
 %install
@@ -85,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Thu Nov  3 2005 Miloslav Trmac <mitr@redhat.com> - 4.14-1
+- Update to stunnel-4.14
+- Override changed default pid file location, keep it in %{_localstatedir}/run
+
 * Sat Oct 22 2005 Miloslav Trmac <mitr@redhat.com> - 4.13-1
 - Update to stunnel-4.13