diff --git a/patch-2.6.1-merge-sigbus.patch b/patch-2.6.1-merge-sigbus.patch
new file mode 100644
index 0000000..6ab41f6
--- /dev/null
+++ b/patch-2.6.1-merge-sigbus.patch
@@ -0,0 +1,11 @@
+--- patch-2.6.1/src/bestmatch.h.BAD	2010-03-10 17:55:53.000000000 +0000
++++ patch-2.6.1/src/bestmatch.h	2010-03-10 17:57:04.000000000 +0000
+@@ -150,7 +150,7 @@
+ 
+   done:
+     if (py)
+-      *py = ymax;
++      *py = (signed int)ymax;
+     return c;
+ }
+ 
diff --git a/patch.spec b/patch.spec
index 37752fa..063c2ee 100644
--- a/patch.spec
+++ b/patch.spec
@@ -1,12 +1,13 @@
 Summary: Utility for modifying/upgrading files
 Name: patch
 Version: 2.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.xz
 Patch1: patch-2.5.4-sigsegv.patch
+Patch2: patch-2.6.1-merge-sigbus.patch
 Patch100: patch-selinux.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,13 +28,14 @@ applications.
 %setup -q
 %patch1 -p1 -b .sigsegv
 %patch100 -p1 -b .selinux
+%patch2 -p1 -b .sigbus
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 %configure
 
 # XXX unset CPPFLAGS on (ultra?)sparc to avoid large file system support
-%ifarch sparc sparc64
+%ifarch %{sparc}
 make CPPFLAGS=""
 %else
 make %{?smp_mflags}
@@ -56,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Wed Mar 10 2010 Dennis Gilmore <dennis@ausil.us> 2.6.1-2
+- add patch to fix sigbus in merge code
+
 * Mon Jan  4 2010 Tim Waugh <twaugh@redhat.com> 2.6.1-1
 - 2.6.1 (bug #551569).  No longer need best-name patch.