diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 8894073d75..2a968ceca1 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -11,7 +11,7 @@ $commentlinks = [ { name => 'changeid',
                   link => 'https://code.launchpad.net/bugs/$2' },
 
                   { name => 'blueprint',
-                  match => '([Bb]lue[Pp]rint|[Bb][Pp])\\s*[#:]?\\s*(\\S+)',
+                  match => '([Bb]lue[Pp]rint|[Bb][Pp])\\s*[#:]?\\s*([A-Za-z0-9\\-]+)',
                   link => 'https://blueprints.launchpad.net/openstack/?searchtext=$2' },
 
                   ]