diff --git a/.gitignore b/.gitignore
index 942c626..88ff23d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,3 +100,5 @@ stunnel-4.33.tar.gz.asc
 /stunnel-5.40.tar.gz.asc
 /stunnel-5.41.tar.gz
 /stunnel-5.41.tar.gz.asc
+/stunnel-5.42.tar.gz
+/stunnel-5.42.tar.gz.asc
diff --git a/sources b/sources
index be7748c..049bc2c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (stunnel-5.41.tar.gz) = cfe414330905d133d4ec698b0d3e40e376a29b70376d88695fbf928c78c8ede36a9d80fca3644f9219a7d4f17fea17cb8bc42e80d788848756bd863bf5eb7ff9
-SHA512 (stunnel-5.41.tar.gz.asc) = 14c3a9fd328ecbbe92af7b940f0353c85a71514e61f01145e5420e0233a177012c340655ba3c1d2c32afc15ca43e80c177459e23111232239e3666b268b52390
+SHA512 (stunnel-5.42.tar.gz) = 875af19e8a4fa8e983e98d3e6bea198b789bea9b18933ed74aa1f9ce6922e4c4dd3a4ccae3b74c12de30c39b68c3210c9adb7cd228c7fefc28dff258dcdb4968
+SHA512 (stunnel-5.42.tar.gz.asc) = 78dafc5699bc087dfce5d1653134469282aa15e5288087e98d4ffbdd97bb5ba8d22c93adb8f74a5a6d9894e724ac37d85479a1b1aad713629b836435b94e8c4d
diff --git a/stunnel.spec b/stunnel.spec
index 62f3c95..d721e2c 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -3,8 +3,8 @@
 
 Summary: A TLS-encrypting socket wrapper
 Name: stunnel
-Version: 5.41
-Release: 3%{?dist}
+Version: 5.42
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.stunnel.org/
@@ -19,6 +19,7 @@ Source7: stunnel@.service
 Patch0: stunnel-5.40-authpriv.patch
 Patch1: stunnel-5.40-systemd-service.patch
 Patch2: stunnel-configure-ac.patch
+Patch3: stunnel-5.42-system-ciphers.patch
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
 BuildRequires: autoconf automake libtool
@@ -40,11 +41,15 @@ conjunction with imapd to create a TLS secure IMAP server.
 %prep
 %setup -q
 %patch0 -p1 -b .authpriv
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .systemd-service
+#%patch2 -p1 -b .fips-config
+%patch3 -p1 -b .system-ciphers
+
+# Fix the configure script output for FIPS mode
+sed -i '/yes).*result: no/,+1s/result: no/result: yes/;s/as_echo "no"/as_echo "yes"/' configure
 
 %build
-autoreconf -v
+#autoreconf -v
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`";
@@ -112,6 +117,10 @@ cp %{SOURCE7} %{buildroot}%{_unitdir}/%{name}@.service
 %endif
 
 %changelog
+* Tue Aug 22 2017 Tomáš Mráz <tmraz@redhat.com> - 5.42-1
+- New upstream release 5.42
+- Use the system cipher list by default (#1483967)
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.41-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild