diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml
index 343202dd..0bf4bb6c 100644
--- a/lib/linguist/vendor.yml
+++ b/lib/linguist/vendor.yml
@@ -36,9 +36,8 @@
 # Go dependencies
 - Godeps/_workspace/
 
-# Exclude minified JavaScript and CSS
-- \.min\.(js|css)$
-- -min\.js$
+# Minified JavaScript and CSS
+- (\.|-)min\.(js|css)$
 
 # Bootstrap css and js
 - (^|/)bootstrap([^.]*)\.(js|css)$
diff --git a/test/test_blob.rb b/test/test_blob.rb
index fab85779..1d37050d 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -304,6 +304,14 @@ class TestBlob < Test::Unit::TestCase
     # Debian packaging
     assert blob("debian/cron.d").vendored?
 
+    # Minified JavaScript and CSS
+    assert blob("foo.min.js").vendored?
+    assert blob("foo.min.css").vendored?
+    assert blob("foo-min.js").vendored?
+    assert blob("foo-min.css").vendored?
+    assert !blob("foomin.css").vendored?
+    assert !blob("foo.min.txt").vendored?
+
     # Prototype
     assert !blob("public/javascripts/application.js").vendored?
     assert blob("public/javascripts/prototype.js").vendored?