diff --git a/loudmouth-1.4.3-libidn.patch b/loudmouth-1.4.3-libidn.patch
new file mode 100644
index 0000000..a0f7d90
--- /dev/null
+++ b/loudmouth-1.4.3-libidn.patch
@@ -0,0 +1,10 @@
+--- loudmouth-1.4.3/loudmouth-1.0.pc.in	2008-10-29 23:19:05.000000000 +1000
++++ loudmouth-1.4.3/loudmouth-1.0.pc.in	2012-07-20 10:54:45.319815966 +1000
+@@ -7,5 +7,6 @@ 
+ Description: libloudmouth
+ Requires: glib-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} -lloudmouth-1 @LIBIDN_LIBS@
++Libs.private: @LIBIDN_LIBS@
++Libs: -L${libdir} -lloudmouth-1
+ Cflags: -I${includedir}/loudmouth-1.0
diff --git a/loudmouth.spec b/loudmouth.spec
index 18937cb..e94f031 100644
--- a/loudmouth.spec
+++ b/loudmouth.spec
@@ -1,9 +1,6 @@
-%define with_ssl   1
-%define gnutls_ver 1.4.0
-
 Name:           loudmouth
 Version:        1.4.3
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        XMPP/Jabber C programming library
 
 Group:          System Environment/Libraries
@@ -15,15 +12,13 @@ Patch1:		%{name}-1.4.3-async_assertion.patch
 Patch2:		%{name}-1.4.3-fix-sasl-md5-digest-uri.patch
 Patch3:		0001-Drop-stanzas-when-failing-to-convert-them-to-LmMessa.patch
 Patch4:		%{name}-1.4.3-glib-compile-fix.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch5:		%{name}-1.4.3-libidn.patch
 
-BuildRequires:  glib2-devel >= 2.4.0
 BuildRequires:	check-devel
-BuildRequires:	libidn-devel
+BuildRequires:	glib2-devel
+BuildRequires:	openssl-devel
 BuildRequires:	libasyncns-devel
-%if %{with_ssl}
-BuildRequires:	gnutls-devel >= %{gnutls_ver}
-%endif
+BuildRequires:	libidn-devel
 
 
 %description
@@ -39,9 +34,7 @@ Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel
 Requires:	libidn-devel
 Requires:	pkgconfig
-%if %{with_ssl}
-Requires:	gnutls-devel >= %{gnutls_ver}
-%endif
+Requires:	gnutls-devel
 
 
 %description devel
@@ -56,24 +49,18 @@ developing applications that use %{name}.
 %patch2 -p1 -b .uri
 %patch3 -p1 -b .stanza
 %patch4 -p1 -b .glibincl
+%patch5 -p1 -b .idn
 
 
 %build
-%configure --enable-static=no	\
-	   --with-asyncns=yes	\
-%if %{with_ssl}
-	   --with-ssl=gnutls
-%else
-	   --with-ssl=no
-%endif
+%configure --enable-static=no --with-asyncns=yes --with-ssl=openssl
 
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -name '*.la' -delete
 
 # Copy the files from the tarball to avoid the IDs generated by gtk-doc being
 # different on different builds
@@ -85,24 +72,18 @@ cp -a docs/reference/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/%{name}/
 make check
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
 
 %files
-%defattr(-,root,root,-)
-%doc ChangeLog NEWS README COPYING
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc NEWS README
 %{_libdir}/libloudmouth*.so.*
 
-
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/libloudmouth*.so
 %{_libdir}/pkgconfig/%{name}-1.0.pc
 %{_includedir}/%{name}-1.0
@@ -110,6 +91,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 19 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.4.3-17
+- Build with openssl support
+- Cleanup spec
+- Don't overlink libidn (rhbz 836761)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.3-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild