--- tagchecker.cfg.orig	2009-07-06 13:37:56.000000000 +1000
+++ tagchecker.cfg	2009-07-08 17:26:52.000000000 +1000
@@ -35,6 +35,36 @@
 #
 # Empty lines and space signs are ignored
 
+way  : W : highway == * && name == /.* Ave\.?$/i               # abbreviated street name (Ave)
+way  : W : highway == * && name == /.* Blvd\.?$/i              # abbreviated street name (Blvd)
+way  : W : highway == * && name == /.* Cct\.?$/i               # abbreviated street name (Cct)
+way  : W : highway == * && name == /.* Cir\.?$/i               # abbreviated street name (Cir)
+way  : W : highway == * && name == /.* Cl\.?$/i                # abbreviated street name (Cl)
+way  : W : highway == * && name == /.* Cr\.?$/i                # abbreviated street name (Cr)
+way  : W : highway == * && name == /.* Crct\.?$/i              # abbreviated street name (Crct)
+way  : W : highway == * && name == /.* Cres\.?$/i              # abbreviated street name (Cres)
+way  : W : highway == * && name == /.* Crt\.?$/i               # abbreviated street name (Crt)
+way  : W : highway == * && name == /.* Ct\.?$/i                # abbreviated street name (Ct)
+way  : W : highway == * && name == /.* Dr\.?$/i                # abbreviated street name (Dr)
+way  : W : highway == * && name == /.* Drv\.?$/i               # abbreviated street name (Drv)
+way  : W : highway == * && name == /.* Esp\.?$/i               # abbreviated street name (Esp)
+way  : W : highway == * && name == /.* Espl\.?$/i              # abbreviated street name (Espl)
+way  : W : highway == * && name == /.* Hwy\.?$/i               # abbreviated street name (Hwy)
+way  : W : highway == * && name == /.* Ln\.?$/i                # abbreviated street name (Ln)
+way  : W : highway == * && name == /.* Mw\.?$/i                # abbreviated street name (Mw)
+way  : W : highway == * && name == /.* Mwy\.?$/i               # abbreviated street name (Mwy)
+way  : W : highway == * && name == /.* Pl\.?$/i                # abbreviated street name (Pl)
+way  : W : highway == * && name == /.* Rd\.?$/i                # abbreviated street name (Rd)
+way  : W : highway == * && name == /.* Qy\.?$/i                # abbreviated street name (Qy)
+way  : W : highway == * && name == /.* Qys\.?$/i               # abbreviated street name (Qys)
+way  : W : highway == * && name == /.* Sq\.?$/i                # abbreviated street name (Sq)
+way  : W : highway == * && name == /.* St\.?$/i                # abbreviated street name (St)
+way  : W : highway == * && name == /.* Str\.?$/i               # abbreviated street name (Str)
+way  : W : highway == * && name == /.* Ter\.?$/i               # abbreviated street name (Ter)
+way  : W : highway == * && name == /.* Tce\.?$/i               # abbreviated street name (Tce)
+way  : W : highway == * && name == /.* Tr\.?$/i                # abbreviated street name (Tr)
+way  : W : highway == * && name == /.* Wy\.?$/i                # abbreviated street name (Wy)
+
 node : W : oneway == *                                         # oneway tag on a node
 node : W : bridge == BOOLEAN_TRUE                              # bridge tag on a node
 node : W : highway == tertiary                                 # wrong highway tag on a node
@@ -61,8 +91,7 @@
 
 *    : W : layer == /\+.*/                                     # layer tag with + sign
 
 *    : I : name == /.*Strasse.*/i                              # street name contains ss
-*    : W : name == /.*Str\.?/i                                 # abbreviated street name
 
 relation : E : type != *                                       # relation without type