diff --git a/Changes b/Changes
index 1e5b27096..112abb41c 100644
--- a/Changes
+++ b/Changes
@@ -1965,3 +1965,4 @@ seen. gmtime warning still there
 - Fixed a bug in /list where opers could not see +s channels when doing /list #channel. 
   Reported by _SciFi_ (#0000762)
 - Fixed a /who big which could make the server crash (oper only).
+- Fixed a match() bug
diff --git a/src/match.c b/src/match.c
index 1e3fedb0d..bef950d14 100644
--- a/src/match.c
+++ b/src/match.c
@@ -97,6 +97,9 @@ static inline int match2(char *mask, char *name)
 			{
 				
 				cm = *(++m);	/* just skip this char, no ? checking */
+				/* In case of something like: '*\', return false. */
+				if (!*m)
+					return 1;
 			}
 			else if (cm == '?')	/* if it's a ? */
 			{