diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb
index d87f281d..06e8025f 100644
--- a/lib/rexml/parsers/baseparser.rb
+++ b/lib/rexml/parsers/baseparser.rb
@@ -59,8 +59,10 @@ class BaseParser
LETTER = '[:alpha:]'
DIGIT = '[:digit:]'
- COMBININGCHAR = '' # TODO
- EXTENDER = '' # TODO
+ # Only the ones that aren't [:alpha:], to avoid duplicated ranges in
+ # the NCNAME_STR character class
+ COMBININGCHAR = '[\p{M}&&[^[:alpha:]]]'
+ EXTENDER = '\u00B7\u0387'
NCNAME_STR= "[#{LETTER}_][-[:alnum:]._#{COMBININGCHAR}#{EXTENDER}]*"
QNAME_STR= "(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})"
diff --git a/test/parse/test_element.rb b/test/parse/test_element.rb
index d1c1c8d3..7c115e18 100644
--- a/test/parse/test_element.rb
+++ b/test/parse/test_element.rb
@@ -164,6 +164,20 @@ def test_after_empty_element_tag_root
end
end
+ def test_combining_character_in_name
+ # U+0301 COMBINING ACUTE ACCENT
+ document = parse("