diff --git a/ChangeLog b/ChangeLog
index 0afbc85..2f93685 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,7 @@
 * Patched filter syntax to support octal \XX codes. Thanks to Kouhei Sutou
   for the patch.
 * Applied an additional patch from Kouhei.
+* Allowed comma in filter strings, suggested by Kouhei.
 
 == Net::LDAP 0.0.4: August 15, 2006
 * Undeprecated Net::LDAP#modify. Thanks to Justin Forder for
diff --git a/lib/net/ldap/filter.rb b/lib/net/ldap/filter.rb
index fc4b090..a3f5899 100644
--- a/lib/net/ldap/filter.rb
+++ b/lib/net/ldap/filter.rb
@@ -471,7 +471,7 @@ class FilterParser #:nodoc:
         scanner.scan(/\s*/)
         #if value = scanner.scan( /[\w\*\.]+/ ) (ORG)
         #if value = scanner.scan( /[\w\*\.\+\-@=#\$%&! ]+/ ) (ff suggested by Kouhei Sutou
-	if value = scanner.scan( /(?:[\w\*\.\+\-@=#\$%&! ]|\\[a-fA-F\d]{2,2})+/ )
+	if value = scanner.scan( /(?:[\w\*\.\+\-@=,#\$%&! ]|\\[a-fA-F\d]{2,2})+/ )
           case op
           when "="
             Filter.eq( token, value )