diff --git a/xchat-2.6.6-nonblock.patch b/xchat-2.6.6-nonblock.patch
new file mode 100644
index 0000000..8d3c28a
--- /dev/null
+++ b/xchat-2.6.6-nonblock.patch
@@ -0,0 +1,20 @@
+--- xchat-2.6.6/src/common/ssl.c.orig	2006-10-07 10:21:57.000000000 +0100
++++ xchat-2.6.6/src/common/ssl.c	2006-10-07 10:24:12.000000000 +0100
+@@ -22,6 +22,7 @@
+ #include <time.h>					  /* asctime() */
+ #include <string.h>				  /* strncpy() */
+ #include "ssl.h"					  /* struct cert_info */
++#include "inet.h"			  /* would_block() */
+ #include "../../config.h"		  /* HAVE_SNPRINTF */
+ 
+ #ifndef HAVE_SNPRINTF
+@@ -256,7 +257,8 @@ _SSL_recv (SSL * ssl, char *buf, int len
+ 		break;
+ 	case SSL_ERROR_SYSCALL:
+ 		/* ??? */
+-		perror ("SSL_read/read");
++		if (!would_block())
++			perror ("SSL_read/read");
+ 		break;
+ 	case SSL_ERROR_ZERO_RETURN:
+ 		/* fprintf(stdeerr, "SSL closed on read\n"); */
diff --git a/xchat.spec b/xchat.spec
index 2ec858c..83dafc6 100644
--- a/xchat.spec
+++ b/xchat.spec
@@ -5,7 +5,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.6.6
-Release:   4%{?dist}
+Release:   5%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -17,6 +17,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root
 Patch10: xchat-2.4.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
 Patch19: xchat-2.0.2-freenode.patch
+Patch21: xchat-2.6.6-nonblock.patch
 Patch22: xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch
 Patch23: xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch
 Patch33: xchat-2.4.3-im_context_filter_keypress.patch
@@ -50,6 +51,7 @@ System.
 %patch10 -p1 -b .redhat-desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
 %patch19 -p0 -b .freenode
+%patch21 -p1 -b .nonblock
 %if %{build_fc2}
 %patch22 -p1 -b .simplify-to-use-gnome-open-for-default-webbrowser
 %else
@@ -121,6 +123,9 @@ unset GCONF_CONFIG_SOURCE
 %{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
 
 %changelog
+* Sat Oct  7 2006 David Woodhouse <dwmw2@redhat.com> - 1.2.6.6-5
+- Fix nonblocking SSL socket behaviour
+
 * Mon Aug 28 2006 Warren Togami <wtogami@redhat.com> - 1:2.6.6-4
 - add upstream 2.6.6 es patch