diff --git a/quote.module b/quote.module
index f21a924..2bf4f7e 100644
--- a/quote.module
+++ b/quote.module
@@ -245,7 +245,7 @@ function _quote_filter_process($text) {
   $author = ''; // Buffer for the author.
 
   // Process the input until the next quote tag.
-  while (preg_match('#\\[\\/?quote(?:\\=(.{1,64}?))?\\]#is', $text, $match, NULL)) {
+  while (preg_match('#\\[\\/?quote(?:[\\=\\-\\s\\/](.{0,64}?))?\\]#is', $text, $match, NULL)) {
     $text = explode($match[0], $text, 2);
     if ($level == 0) {
       $author = empty($match[1]) ? '' : trim($match[1]);