diff --git a/xchat.spec b/xchat.spec
index d37ca84..0f234c7 100644
--- a/xchat.spec
+++ b/xchat.spec
@@ -1,3 +1,7 @@
+# Enable this for Fedora Core 2 builds and newer.  For Fedora Core 1,
+# Red Hat Linux 9, and Red Hat Enterprise Linux 3, set to 0
+%define build_fc2		1
+
 # Nobody likely uses this so we disable it
 %define with_tclplugin		0
 # This calls autoconf prior 
@@ -6,7 +10,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.0.7
-Release: 2
+Release:   5
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -19,9 +23,9 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 Patch10: xchat-2.0.4-redhat-desktop-file.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
-# Adds new xchat command /NICKALL to change your nick on all servers at once
-Patch18: xchat-1.8.11-nickall.patch
 Patch19: xchat-2.0.2-freenode.patch
+Patch20: xchat-2.0.7-simplify-to-use-gnome-open-for-default-webbrowser.patch
+Patch21: xchat-2.0.7-simplify-to-use-htmlview-for-default-webbrowser.patch
 
 BuildRequires: perl python-devel openssl-devel pkgconfig
 %if %{require_autoconf}
@@ -46,9 +50,12 @@ System.
 #%patch0 -p1 -b .fixperlui
 %patch10 -p0 -b .redhat-desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
-# Disabled as it doesnt apply, needs investigation, and possible porting
-#%patch18 -p1 -b .nickall
 %patch19 -p0 -b .freenode
+%if %{build_fc2}
+%patch20 -p0 -b .simplify-to-use-gnome-open-for-default-webbrowser
+%else
+%patch21 -p0 -b .simplify-to-use-htmlview-for-default-webbrowser
+%endif
 
 
 %build
@@ -115,10 +122,30 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Mar  9 2004 Mike A. Harris <mharris@redhat.com> 1:2.0.7-5
+- Bump and rebuild for Fedora devel, to sync up with new perl
+
+* Fri Mar  5 2004 Mike A. Harris <mharris@redhat.com> 1:2.0.7-4
+- Added xchat-2.0.7-simplify-to-use-gnome-open-for-default-webbrowser.patch
+  and xchat-2.0.7-simplify-to-use-htmlview-for-default-webbrowser.patch to
+  simplify the default URL handler menu to point only to the default system
+  web browser by using gnome-open on Fedora Core 2 and later, or htmlview
+  on earlier OS releases.  This is added to improve user friendliness (#82331)
+
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Feb 17 2004 Mike A. Harris <mharris@redhat.com> 1:2.0.7-1.FC1.0
+- Rebuild xchat 2.0.7-3 as 2.0.7-1.FC1.0 for release as an enhancement erratum
+  for Fedora Core 1.  Also fixes AMD64 64bit issues reported in bug (#114237)
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com> 1:2.0.7-3
+- rebuilt
+
 * Mon Jan 26 2004 Jeremy Katz <katzj@redhat.com> 1:2.0.7-2
 - rebuild for new perl version
 
-* Sat Jan 10 2004 Mike A. Harris <mharris@redhat.com> 2.0.7-1
+* Sat Jan 10 2004 Mike A. Harris <mharris@redhat.com> 1:2.0.7-1
 - Updated to xchat 2.0.7
 - Removed already integrated patches, including:  xc204-fixperlui.diff,
   xchat-2.0.4-screen-position-fix.patch, xchat-2.0.4-exec-shield-GNU-stack.patch