diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 29d9a669..c7dc7c41 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -263,7 +263,13 @@ Go:
 Groff:
   extensions:
   - .man
-  - .[1234567]
+  - .1
+  - .2
+  - .3
+  - .4
+  - .5
+  - .6
+  - .7
 
 Groovy:
   lexer: java
@@ -469,7 +475,6 @@ OpenCL:
 PHP:
   extensions:
   - .php
-  - .php[345]
   - .aw
   - .php3
   - .php4
diff --git a/test/test_language.rb b/test/test_language.rb
index fe9c627e..c31c73af 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -271,6 +271,14 @@ class TestLanguage < Test::Unit::TestCase
   def test_find_by_extension
     assert_equal Language['Ruby'], Language.find_by_extension('.rb')
     assert_equal Language['Ruby'], Language.find_by_extension('rb')
+    assert_equal Language['Groff'], Language.find_by_extension('man')
+    assert_equal Language['Groff'], Language.find_by_extension('1')
+    assert_equal Language['Groff'], Language.find_by_extension('2')
+    assert_equal Language['Groff'], Language.find_by_extension('3')
+    assert_equal Language['PHP'], Language.find_by_extension('php')
+    assert_equal Language['PHP'], Language.find_by_extension('php3')
+    assert_equal Language['PHP'], Language.find_by_extension('php4')
+    assert_equal Language['PHP'], Language.find_by_extension('php5')
     assert_nil Language.find_by_extension('.kt')
   end