diff --git a/rules/token-matching.xml b/rules/token-matching.xml
new file mode 100644
index 000000000..6abcc7cde
--- /dev/null
+++ b/rules/token-matching.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<rule version="1">
+    <pattern>Token :: (?:findm|(?:simple|)M)atch \([^,]+,\s+"\s+</pattern>
+    <message>
+        <id>TokenMatchSpacing</id>
+        <severity>style</severity>
+        <summary>Useless extra spacing for Token::*Match.</summary>
+    </message>
+</rule>
+<rule version="1">
+    <pattern>Token :: Match \([^,]+,\s+"[^%|!\[\]]+"</pattern>
+    <message>
+	<id>UseTokensimpleMatch</id>
+	<severity>error</severity>
+	<summary>Token::simpleMatch should be used to match tokens
+without special pattern requirements.</summary>
+    </message>
+</rule>