diff --git a/docs/notework.txt b/docs/notework.txt
index fc247ec..f7c5f14 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -10,6 +10,9 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
+- regex: \w and \W work for all characters. Also, \b and \B should work
+  correctly.
+
 - Fixed case sensitive advances search.
 
 + AKAMatchManually will work also for forwards and new messages in netmail
diff --git a/goldlib/glibc/regex.c b/goldlib/glibc/regex.c
index c76bb71..a733b78 100644
--- a/goldlib/glibc/regex.c
+++ b/goldlib/glibc/regex.c
@@ -150,6 +150,9 @@ char *realloc ();
 #  endif
 # endif
 
+/* isalpha etc. are used for the character classes.  */
+#include <gctype.h>
+
 /* Define the syntax stuff for \<, \>, etc.  */
 
 /* This must be nonzero for the wordchar and notwordchar pattern
@@ -186,14 +189,17 @@ init_syntax_once ()
 
    bzero (re_syntax_table, sizeof re_syntax_table);
 
-   for (c = 'a'; c <= 'z'; c++)
+/* for (c = 'a'; c <= 'z'; c++)
      re_syntax_table[c] = Sword;
 
    for (c = 'A'; c <= 'Z'; c++)
      re_syntax_table[c] = Sword;
 
    for (c = '0'; c <= '9'; c++)
-     re_syntax_table[c] = Sword;
+     re_syntax_table[c] = Sword; */
+
+   for (c = 0; c < 256; c++)
+     re_syntax_table[c] = isxalnum(c) ? Sword : 0;
 
    re_syntax_table['_'] = Sword;
 
@@ -209,9 +215,6 @@ init_syntax_once ()
 /* Get the interface, including the syntax bits.  */
 #include "regex.h"
 
-/* isalpha etc. are used for the character classes.  */
-#include <gctype.h>
-
 /* Jim Meyering writes:
 
    "... Some ctype macros are valid only for character codes that