diff --git a/lib/diaspora/taggable.rb b/lib/diaspora/taggable.rb
index 9704681ed..404b415bd 100644
--- a/lib/diaspora/taggable.rb
+++ b/lib/diaspora/taggable.rb
@@ -36,7 +36,7 @@ module Diaspora
 
     def format_tags(text, opts={})
       return text if opts[:plain_text]
-      regex = /(^|\s)#(\w+)/
+      regex = /(^|\s)#([a-zA-Z0-9\-]+)/
       form_message = text.gsub(regex) do |matched_string|
         "#{$~[1]}<a href=\"/tags/#{$~[2]}\" class=\"tag\">##{$~[2]}</a>"
       end