diff --git a/xchat-2.8.6-connect-mnemonic.patch b/xchat-2.8.6-connect-mnemonic.patch
new file mode 100644
index 0000000..00a546d
--- /dev/null
+++ b/xchat-2.8.6-connect-mnemonic.patch
@@ -0,0 +1,11 @@
+diff -up xchat-2.8.6/src/fe-gtk/gtkutil.c.mnemonic xchat-2.8.6/src/fe-gtk/gtkutil.c
+--- xchat-2.8.6/src/fe-gtk/gtkutil.c.mnemonic	2009-07-15 20:41:23.080340947 -0400
++++ xchat-2.8.6/src/fe-gtk/gtkutil.c	2009-07-15 20:41:48.181069489 -0400
+@@ -376,6 +376,7 @@ gtkutil_button (GtkWidget *box, char *st
+ 	{
+ 		gtk_button_set_label (GTK_BUTTON (wid), labeltext);
+ 		gtk_button_set_image (GTK_BUTTON (wid), gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU));
++		gtk_label_set_use_underline (GTK_BUTTON (wid), TRUE);
+ 		if (box)
+ 			gtk_container_add (GTK_CONTAINER (box), wid);
+ 	}
diff --git a/xchat.spec b/xchat.spec
index 96802bb..82268f7 100644
--- a/xchat.spec
+++ b/xchat.spec
@@ -4,7 +4,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.6
-Release:   8%{?dist}
+Release:   9%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -27,6 +27,8 @@ Patch40: xchat-2.8.4-shm-pixmaps.patch
 # Both the "IRC" and "UTF-8" settings will try to accept both Latin1 and UTF-8
 # when it comes in, however "IRC" sends Latin1, "UTF-8" sends UTF-8.
 Patch41: xchat-2.8.6-default-utf8.patch
+# fix literal underscore in "C_onnect" button (#512034, Matthias Clasen)
+Patch42: xchat-2.8.6-connect-mnemonic.patch
 
 BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel
 BuildRequires: GConf2-devel
@@ -75,6 +77,7 @@ This package contains the X-Chat plugin providing the Tcl scripting interface.
 %patch35 -p1 -b .tray-icon
 %patch40 -p1 -b .shm-pixmaps
 %patch41 -p1 -b .default-utf8
+%patch42 -p1 -b .connect-mnemonic
 
 sed -i -e 's/#define GTK_DISABLE_DEPRECATED//g' src/fe-gtk/*.c
 
@@ -164,6 +167,9 @@ fi
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Thu Jul 16 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1:2.8.6-9
+- Fix literal underscore in "C_onnect" button (#512034, Matthias Clasen)
+
 * Mon Jun 29 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1:2.8.6-8
 - Change Name in xchat.desktop to XChat IRC (#293841)