diff --git a/pidgin-enable-sni-gnutls.patch b/pidgin-enable-sni-gnutls.patch
new file mode 100644
index 0000000..36c53f2
--- /dev/null
+++ b/pidgin-enable-sni-gnutls.patch
@@ -0,0 +1,13 @@
+--- a/libpurple/plugins/ssl/ssl-gnutls.c
++++ b/libpurple/plugins/ssl/ssl-gnutls.c
+@@ -403,6 +403,10 @@ ssl_gnutls_connect(PurpleSslConnection *gsc)
+ 
+ 	gnutls_transport_set_ptr(gnutls_data->session, GINT_TO_POINTER(gsc->fd));
+ 
++	if (gsc->host) {
++		gnutls_server_name_set (gnutls_data->session, GNUTLS_NAME_DNS, gsc->host, strlen(gsc->host));
++	}
++
+ 	gnutls_data->handshake_handler = purple_input_add(gsc->fd,
+ 		PURPLE_INPUT_READ, ssl_gnutls_handshake_cb, gsc);
+ 
diff --git a/pidgin.changes b/pidgin.changes
index d52f97c..968d981 100644
--- a/pidgin.changes
+++ b/pidgin.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 12 07:43:51 UTC 2018 - fezhang@suse.com
+
+- Add pidgin-enable-sni-gnutls.patch: Enable SNI for gnutls to
+  avoid SSL handshake failure, patch written by Tiago Herrmann
+  (therrmann@suse.com) (bsc#1086349, pidgin.im#17300).
+
 -------------------------------------------------------------------
 Thu Mar 15 16:19:49 UTC 2018 - sor.alexei@meowr.ru
 
diff --git a/pidgin.spec b/pidgin.spec
index 2162884..76399de 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -38,6 +38,8 @@ Patch2:         pidgin-fix-perl-build.patch
 Patch3:         pidgin-ncurses-6.0-accessors.patch
 # PATCH-FIX-SLE pidgin-use-default-alsa.patch bsc#886670 tiwai@suse.de -- Use ALSA as a default for avoiding broken volume control.
 Patch4:         pidgin-use-default-alsa.patch
+# PATCH-FIX-UPSTREAM pidgin-enable-sni-gnutls.patch bsc#1086349 pidgin.im#17300 fezhang@suse.com -- Enable SNI extension in GnuTLS connections.
+Patch5:         pidgin-enable-sni-gnutls.patch
 BuildRequires:  ca-certificates-mozilla
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -234,6 +236,7 @@ translation-update-upstream
 %if 0%{?sle_version} >= 120000 && !0%{?is_opensuse}
 %patch4 -p1
 %endif
+%patch5 -p1
 
 cp -f %{SOURCE3} %{name}-prefs.xml