diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index aeb8a84..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: diffutils
-# $Id: Makefile,v 1.1 2004/09/09 04:12:59 cvsdist Exp $
-NAME := diffutils
-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),)
-# attempt 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/diffutils-2.8.4-i18n.patch b/diffutils-2.8.4-i18n.patch
index 2042c9f..d601e6f 100644
--- a/diffutils-2.8.4-i18n.patch
+++ b/diffutils-2.8.4-i18n.patch
@@ -376,7 +376,7 @@
  	      continue;
  
 -	    if (! lines_differ (eqline, ip))
-+	    if (! lines_differ (eqline, eqs[i].length, ip, length))
++	    if (! lines_differ (eqline, eqs[i].length + 1, ip, length + 1))
  	      break;
  	  }
  
diff --git a/diffutils.spec b/diffutils.spec
index 9787385..cb77437 100644
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -1,7 +1,7 @@
 Summary: A GNU collection of diff utilities.
 Name: diffutils
 Version: 2.8.1
-Release: 17%{?dist}
+Release: 19%{?dist}
 Group: Applications/Text
 URL: http://www.gnu.org/software/diffutils/diffutils.html
 Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz
@@ -77,6 +77,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/diff.info*gz
 
 %changelog
+* Tue Nov  6 2007 Tim Waugh <twaugh@redhat.com> 2.8.1-19
+- Rebuilt.
+
+* Tue Nov  6 2007 Tim Waugh <twaugh@redhat.com> 2.8.1-18
+- Fixed multibyte speed improvement patch (bug #363831).
+
 * Tue Aug 14 2007 Tim Waugh <twaugh@redhat.com> 2.8.1-17
 - Multibyte speed improvement (bug #252117).