diff --git a/grep-2.5.1-w.patch b/grep-2.5.1-w.patch
new file mode 100644
index 0000000..e4d6ea2
--- /dev/null
+++ b/grep-2.5.1-w.patch
@@ -0,0 +1,117 @@
+--- grep-2.5.1a/src/search.c.w	2005-01-07 15:04:18.766280754 +0000
++++ grep-2.5.1a/src/search.c	2005-01-07 16:59:19.287275172 +0000
+@@ -330,6 +330,7 @@
+   static int use_dfa;
+   static int use_dfa_checked = 0;
+ #ifdef MBS_SUPPORT
++  const char *last_char = NULL;
+   int mb_cur_max = MB_CUR_MAX;
+   mbstate_t mbs;
+   memset (&mbs, '\0', sizeof (mbstate_t));
+@@ -385,6 +386,8 @@
+ 		  while (bytes_left)
+ 		    {
+ 		      size_t mlen = mbrlen (beg, bytes_left, &mbs);
++
++		      last_char = beg;
+ 		      if (mlen == (size_t) -1 || mlen == 0)
+ 			{
+ 			  /* Incomplete character: treat as single-byte. */
+@@ -445,6 +448,8 @@
+ 		  while (bytes_left)
+ 		    {
+ 		      size_t mlen = mbrlen (beg, bytes_left, &mbs);
++
++		      last_char = beg;
+ 		      if (mlen == (size_t) -1 || mlen == 0)
+ 			{
+ 			  /* Incomplete character: treat as single-byte. */
+@@ -507,10 +512,84 @@
+ 	      if (match_words)
+ 		while (start >= 0)
+ 		  {
+-		    if ((start == 0 || !WCHAR ((unsigned char) beg[start - 1]))
+-			&& (len == end - beg - 1
+-			    || !WCHAR ((unsigned char) beg[start + len])))
+-		      goto success_in_beg_and_end;
++		    int lword_match = 0;
++		    if (start == 0)
++		      lword_match = 1;
++		    else
++		      {
++			assert (start > 0);
++#ifdef MBS_SUPPORT
++			if (mb_cur_max > 1)
++			  {
++			    const char *s;
++			    int mr;
++			    wchar_t pwc;
++
++			    if (using_utf8)
++			      {
++				s = beg + start - 1;
++				while (s > buf
++				       && (unsigned char) *s >= 0x80
++				       && (unsigned char) *s <= 0xbf)
++				  --s;
++			      }
++			    else
++			      s = last_char;
++			    mr = mbtowc (&pwc, s, beg + start - s);
++			    if (mr <= 0)
++			      {
++				memset (&mbs, '\0', sizeof (mbstate_t));
++				lword_match = 1;
++			      }
++			    else if (!(iswalnum (pwc) || pwc == L'_')
++				     && mr == (int) (beg + start - s))
++			      lword_match = 1;
++			  }
++			else
++#endif /* MBS_SUPPORT */
++			if (!WCHAR ((unsigned char) beg[start - 1]))
++			  lword_match = 1;
++		      }
++
++		    if (lword_match)
++		      {
++			int rword_match = 0;
++			if (start + len == end - beg - 1)
++			  rword_match = 1;
++			else
++			  {
++#ifdef MBS_SUPPORT
++			    if (mb_cur_max > 1)
++			      {
++				wchar_t nwc;
++				int mr;
++
++				mr = mbtowc (&nwc, beg + start + len,
++					     end - beg - start - len - 1);
++				if (mr <= 0)
++				  {
++				    memset (&mbs, '\0', sizeof (mbstate_t));
++				    rword_match = 1;
++				  }
++				else if (!iswalnum (nwc) && nwc != L'_')
++				  rword_match = 1;
++			      }
++			    else
++#endif /* MBS_SUPPORT */
++			    if (!WCHAR ((unsigned char) beg[start + len]))
++			      rword_match = 1;
++			  }
++
++			if (rword_match)
++			  {
++			    if (!exact)
++			      /* Returns the whole line. */
++			      goto success_in_beg_and_end;
++			    else
++			      /* Returns just this word match. */
++			      goto success_in_start_and_len;
++			  }
++		      }
+ 		    if (len > 0)
+ 		      {
+ 			/* Try a shorter length anchored at the same place. */
diff --git a/grep.spec b/grep.spec
index 648c654..169d9bb 100644
--- a/grep.spec
+++ b/grep.spec
@@ -15,6 +15,7 @@ Patch6: grep-2.5.1-icolor.patch
 Patch10: grep-2.5.1-egf-speedup.patch
 Patch11: grep-2.5.1-dfa-optional.patch
 Patch12: grep-2.5.1-tests.patch
+Patch13: grep-2.5.1-w.patch
 URL: http://www.gnu.org/software/grep/
 Prereq: /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -42,6 +43,7 @@ utility for searching through text.
 %patch10 -p1 -b .egf-speedup
 %patch11 -p1 -b .dfa-optional
 %patch12 -p1 -b .tests
+%patch13 -p1 -b .w
 chmod a+x tests/fmbtest.sh
 
 %build
@@ -91,6 +93,7 @@ fi
 
 %changelog
 * Fri Jan  7 2005 Tim Waugh <twaugh@redhat.com>
+- Fixed -w handling for EGexecute.  Now 'make check' passes.
 - Cache MB_CUR_MAX value in egf-speedup patch.
 - Fixed variable shadowing in egf-speedup patch.
 - Removed redundant (and incorrect) code in prline.