diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index d076b307..336632af 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -89,7 +89,7 @@ class Changeset < ActiveRecord::Base
     if ref_keywords.delete('*')
       # find any issue ID in the comments
       target_issue_ids = []
-      comments.scan(%r{([\s\(,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
+      comments.scan(%r{([\s\(\[,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
       referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
     end
     
diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
index e5dc6d73..51d8b745 100644
--- a/test/unit/changeset_test.rb
+++ b/test/unit/changeset_test.rb
@@ -53,6 +53,28 @@ class ChangesetTest < Test::Unit::TestCase
     assert_equal [1], c.issue_ids.sort
   end
 
+  def test_ref_keywords_allow_brackets_around_a_issue_number
+    Setting.commit_ref_keywords = '*'
+
+    c = Changeset.new(:repository => Project.find(1).repository,
+                      :committed_on => Time.now,
+                      :comments => '[#1] Worked on this issue')
+    c.scan_comment_for_issue_ids
+
+    assert_equal [1], c.issue_ids.sort
+  end
+
+  def test_ref_keywords_allow_brackets_around_multiple_issue_numbers
+    Setting.commit_ref_keywords = '*'
+
+    c = Changeset.new(:repository => Project.find(1).repository,
+                      :committed_on => Time.now,
+                      :comments => '[#1 #2, #3] Worked on these')
+    c.scan_comment_for_issue_ids
+
+    assert_equal [1,2,3], c.issue_ids.sort
+  end
+
   def test_previous
     changeset = Changeset.find_by_revision('3')
     assert_equal Changeset.find_by_revision('2'), changeset.previous