diff --git a/grep-2.5.1-egf-speedup.patch b/grep-2.5.1-egf-speedup.patch
index f684555..a90836d 100644
--- a/grep-2.5.1-egf-speedup.patch
+++ b/grep-2.5.1-egf-speedup.patch
@@ -659,7 +659,7 @@
 +		}
 +	      else
 +#endif /* MBS_SUPPORT */
-+		if (beg + len >= buf + size && !WCHAR ((unsigned char) beg[len]))
++		if (beg + len >= buf + size || !WCHAR ((unsigned char) beg[len]))
 +		  word_match = 1;
 +	      if (word_match)
 +		{
diff --git a/grep.spec b/grep.spec
index 8503322..6e9e209 100644
--- a/grep.spec
+++ b/grep.spec
@@ -92,6 +92,9 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Mon Jun 27 2005 Tim Waugh <twaugh@redhat.com>
+- Fix 'grep -Fw' for encodings other than UTF-8 (bug #161700).
+
 * Wed Apr 13 2005 Tim Waugh <twaugh@redhat.com>
 - Build requires recent pcre-devel (bug #154626).