diff --git a/.cvsignore b/.cvsignore
index 6b5f1ea..ba50fba 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cone-0.60.tar.bz2
+cone-0.63.tar.bz2
diff --git a/cone-0.60-gcc34.patch b/cone-0.60-gcc34.patch
deleted file mode 100644
index 1d11e25..0000000
--- a/cone-0.60-gcc34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur cone-0.60-orig/libmail/addressbookget.C cone-0.60/libmail/addressbookget.C
---- cone-0.60-orig/libmail/addressbookget.C	2004-05-30 04:43:00.000000000 +0200
-+++ cone-0.60/libmail/addressbookget.C	2004-11-12 18:12:55.000000000 +0100
-@@ -260,5 +260,5 @@
- 	addressBookLineMap.insert(make_pair(hdr, text));
- }
- 
--template mail::addressbook::GetAddressList<mail::address>;
--template mail::addressbook::GetAddressList<mail::emailAddress>;
-+template class mail::addressbook::GetAddressList<mail::address>;
-+template class mail::addressbook::GetAddressList<mail::emailAddress>;
diff --git a/cone-0.63.tar.bz2.sig b/cone-0.63.tar.bz2.sig
new file mode 100644
index 0000000..f4077bb
Binary files /dev/null and b/cone-0.63.tar.bz2.sig differ
diff --git a/cone.spec b/cone.spec
index 97794ff..a1bfd6c 100644
--- a/cone.spec
+++ b/cone.spec
@@ -1,12 +1,12 @@
-%define curses_include_dir  /usr/include/ncursesw
+%define curses_include_dir  %{_includedir}/ncursesw
 
 Summary: CONE mail reader
 Name: cone
-Version: 0.60
-Release: 2
+Version: 0.63
+Release: 1
 URL: http://www.courier-mta.org/cone/
 Source0: http://dl.sf.net/sourceforge/courier/%{name}-%{version}.tar.bz2
-Patch: cone-0.60-gcc34.patch
+Source1: http://dl.sf.net/sourceforge/courier/%{name}-%{version}.tar.bz2.sig
 License: GPL
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -41,7 +41,6 @@ contains a large amount of documentation for CONE.
 
 %prep
 %setup -q
-%patch -p1 -b .gcc34
 
 %build
 CPPFLAGS="$CPPFLAGS -I%{curses_include_dir}"
@@ -98,6 +97,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc cone/html
 
 %changelog
+* Wed Feb 23 2005 Steven Pritchard <steve@kspei.com> 0.63-1
+- Update to 0.63
+- Include signature file with the source rpm
+- Drop GCC 3.4 patch (already included upstream)
+
 * Fri Nov 12 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0.60-2
 - Fix addressbookget.C for GCC 3.4.
 
diff --git a/sources b/sources
index 06e1c3b..7ca4609 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b2ae0cb3808e5485d566474c8bf251f9  cone-0.60.tar.bz2
+d77f9bfe50ae796c70bb18a7ae59e44c  cone-0.63.tar.bz2