diff --git a/.gitignore b/.gitignore
index dc6f0c7..73ec607 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,6 @@ stunnel-4.33.tar.gz.asc
 /stunnel-5.01.tar.gz
 /stunnel-5.01.tar.gz.asc
 /stunnel-5.01.tar.gz.sha256
+/stunnel-5.02.tar.gz
+/stunnel-5.02.tar.gz.asc
+/stunnel-5.02.tar.gz.sha256
diff --git a/sources b/sources
index 98ea627..e5ce59d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-7b63266b6fa05da696729e245100da65  stunnel-5.01.tar.gz
-d5fbdcd7ffad5f6a6e126c8012c0163f  stunnel-5.01.tar.gz.asc
-0436589e74006a9d66bbaa1604a5a350  stunnel-5.01.tar.gz.sha256
+bb48b1c18cfc0a42708ef996b1a26926  stunnel-5.02.tar.gz
+44cdac12d068c9698a96b37d72f723cf  stunnel-5.02.tar.gz.asc
+74e194012986c1c9df53893d46098d43  stunnel-5.02.tar.gz.sha256
diff --git a/stunnel-5-sample.patch b/stunnel-5-sample.patch
index a7d6e89..fea3248 100644
--- a/stunnel-5-sample.patch
+++ b/stunnel-5-sample.patch
@@ -1,16 +1,16 @@
-diff -urNp stunnel-5.00-patched/tools/stunnel.conf-sample.in stunnel-5.00-current/tools/stunnel.conf-sample.in
---- stunnel-5.00-patched/tools/stunnel.conf-sample.in	2014-03-07 14:04:50.015418514 -0500
-+++ stunnel-5.00-current/tools/stunnel.conf-sample.in	2014-03-07 14:06:45.501516446 -0500
+diff -urNp stunnel-5.02-patched/tools/stunnel.conf-sample.in stunnel-5.02-current/tools/stunnel.conf-sample.in
+--- stunnel-5.02-patched/tools/stunnel.conf-sample.in	2014-07-14 13:12:23.093008573 -0400
++++ stunnel-5.02-current/tools/stunnel.conf-sample.in	2014-07-14 13:22:38.431698073 -0400
 @@ -9,7 +9,7 @@
  
  ; A copy of some devices and system files is needed within the chroot jail
  ; Chroot conflicts with configuration file reload and many other features
--chroot = @prefix@/var/lib/stunnel/
-+chroot = @localstatedir@/run/stunnel/
+-;chroot = @prefix@/var/lib/stunnel/
++;chroot = @localstatedir@/run/stunnel/
  ; Chroot jail can be escaped if setuid option is not used
  setuid = nobody
  setgid = @DEFAULT_GROUP@
-@@ -26,8 +26,8 @@ pid = /stunnel.pid
+@@ -26,8 +26,8 @@ setgid = @DEFAULT_GROUP@
  ; **************************************************************************
  
  ; Certificate/key is needed in server mode and optional in client mode
diff --git a/stunnel.spec b/stunnel.spec
index cefdaad..6e03b85 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 5.01
-Release: 3%{?dist}
+Version: 5.02
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.stunnel.org/
@@ -56,8 +56,6 @@ make LDADD="-pie -Wl,-z,defs,-z,relro,-z,now"
 
 %install
 #rm -rf $RPM_BUILD_ROOT
-#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/stunnel
-#touch $RPM_BUILD_ROOT%{_sysconfdir}/stunnel/stunnel.pem
 make install DESTDIR=$RPM_BUILD_ROOT
 # Move the translated man pages to the right subdirectories, and strip off the
 # language suffixes.
@@ -115,6 +113,15 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jul 14 2014 Avesh Agarwal <avagarwa@redhat.com> - 5.02-1
+- rhbz#1108818: New upstream realease 5.02
+- Updated local patches
+- The rhbz#530950 is tested and seems to work. STRLEN has
+  been no longer allocated statically since 4.36 version.
+  So it is possible that this bz might have got fixed
+  around 4.36 release.
+- Fixes rpmlint errors
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.01-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild