diff --git a/0031-Revert-ureport-use-rhsm-ssl-client-auth-by-default.patch b/0031-Revert-ureport-use-rhsm-ssl-client-auth-by-default.patch
new file mode 100644
index 0000000..e33266d
--- /dev/null
+++ b/0031-Revert-ureport-use-rhsm-ssl-client-auth-by-default.patch
@@ -0,0 +1,28 @@
+From f09e0c2a6c6af89f4c3c3cfd9c56cce47439f383 Mon Sep 17 00:00:00 2001
+From: Jakub Filak <jfilak@redhat.com>
+Date: Thu, 13 Nov 2014 07:01:37 +0100
+Subject: [PATCH] Revert "ureport: use 'rhsm' ssl client auth by default"
+
+This reverts commit fb554038d9bc692d99fbd6eace61979dc48a8b93.
+
+Accidentally cherry-picked from the rhel7 branch.
+---
+ src/plugins/ureport.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/ureport.conf b/src/plugins/ureport.conf
+index 75c4893..da00990 100644
+--- a/src/plugins/ureport.conf
++++ b/src/plugins/ureport.conf
+@@ -23,7 +23,7 @@
+ # None (default):
+ # SSLClientAuth =
+ # Using RH subscription management entitlement certificate:
+-SSLClientAuth = rhsm
++# SSLClientAuth = rhsm
+ # Using Puppet certificate:
+ # SSLClientAuth = puppet
+ # Using custom certificate:
+-- 
+2.1.0
+
diff --git a/libreport.spec b/libreport.spec
index 8dfee57..cb14efc 100644
--- a/libreport.spec
+++ b/libreport.spec
@@ -7,7 +7,7 @@
 Summary: Generic library for reporting various problems
 Name: libreport
 Version: 2.3.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: https://github.com/abrt/abrt/wiki/ABRT-Project
@@ -46,6 +46,7 @@ Patch0027: 0027-testsuite-do-not-expected-ureport-exiting-on-rhsm-ce.patch
 #Patch0028: 0028-spec-dump-the-log-files-of-failed-unit-tests.patch
 Patch0029: 0029-Prevent-duplicate-values-for-CODE_-fields-being-logg.patch
 #Patch0030: 0030-spec-update-the-URL.patch
+Patch0031: 0031-Revert-ureport-use-rhsm-ssl-client-auth-by-default.patch
 Patch1001: 0001-Temporary-Rawhide-patch-test-FAF-s-Webui2.patch
 
 # git is need for '%%autosetup -S git' which automatically applies all the
@@ -709,6 +710,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Nov 13 2014 Jakub Filak <jfilak@redhat.com> 2.3.0-6
+- ureport: do not use 'rhsm' SSL auth by default
+
 * Thu Nov 06 2014 Jakub Filak <jfilak@redhat.com> 2.3.0-5
 - Prevent duplicate values for CODE_* fields being logged to journal
 - ureport and rhtsupport bug fixes