diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 8c747f0..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xchat-gnome-0.26.0.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dc6a32d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xchat-gnome-0.26.1.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 032c409..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xchat-gnome
-# $Id$
-NAME := xchat-gnome
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/sources b/sources
index efc556d..bb6869b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef230db0d104faa8dc7e5060c51f7261  xchat-gnome-0.26.0.tar.bz2
+c9ce3d6e549736edfc1a1dc0282fb363  xchat-gnome-0.26.1.tar.bz2
diff --git a/xchat-gnome.spec b/xchat-gnome.spec
index dddf793..bdf4250 100644
--- a/xchat-gnome.spec
+++ b/xchat-gnome.spec
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
-Version:        0.26.0
-Release:        1%{?dist}
+Version:        0.26.1
+Release:        3%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -9,6 +9,9 @@ URL:            http://%{name}.navi.cx/
 Source0:        http://ftp.acc.umu.se/pub/gnome/sources/%{name}/0.26/%{name}-%{version}.tar.bz2
 # Patch specific to Fedora to use .xchat-gnome, instead of .xchat2
 Patch0:		%{name}-0.23.92-config.patch
+# Patch to fix pressing "enter" in the middle of editing channel topic.
+# RH Bug #483839
+Patch1:		xchat-topic-update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -48,6 +51,7 @@ common settings will be included in the main user interface. .
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
+%patch1 -p1 -b .topic
 
 
 %build
@@ -136,6 +140,15 @@ fi
 
 
 %changelog
+* Fri Jun 19 2009 Brian Pepple <bpepple@fedoraproject.org> - 0.26.1-3
+- Fix topic patch.
+
+* Sun May 10 2009 Brian Pepple <bpepple@fedoraproject.org> - 0.26.1-2
+- Add patch to fix topic entry bug. (#483839)
+
+* Sat Apr 18 2009 Brian Pepple <bpepple@fedoraproject.org> - 0.26.1-1
+- Update to 0.26.1.
+
 * Tue Mar 31 2009 Brian Pepple <bpepple@fedoraproject.org> - 0.26.0-1
 - Update to 0.26.0.
 
diff --git a/xchat-topic-update.patch b/xchat-topic-update.patch
new file mode 100644
index 0000000..b572469
--- /dev/null
+++ b/xchat-topic-update.patch
@@ -0,0 +1,20 @@
+From 6d1a939a14de918de4a79c010d82796f8035bcfa Mon Sep 17 00:00:00 2001
+From: Josselin Mouette <^Css@malsain.org>
+Date: Thu, 18 Jun 2009 09:41:33 +0000
+Subject: Bug 536916 – Pressing "Enter" in the middle of editing channel topic truncates it.
+
+---
+diff --git a/src/fe-gnome/topic-label.c b/src/fe-gnome/topic-label.c
+index a7d1883..977d29c 100644
+--- a/src/fe-gnome/topic-label.c
++++ b/src/fe-gnome/topic-label.c
+@@ -315,6 +315,7 @@ static void
+ topic_entry_activate (GtkTextBuffer *textbuffer, GtkTextIter *arg1, gchar *text, gint len, GtkDialog *dialog)
+ {
+ 	if (strncmp (text, "\n", len) == 0) {
++		g_signal_stop_emission_by_name (G_OBJECT (textbuffer), "insert-text");
+ 		gtk_dialog_response (dialog, GTK_RESPONSE_OK);
+ 	}
+ }
+--
+cgit v0.8.2