diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index ba335939..9d8bed8d 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -232,6 +232,8 @@ Clojure:
   primary_extension: .clj
   extensions:
   - .cljs
+  filenames:
+  - riemann.config
 
 CoffeeScript:
   type: programming
diff --git a/test/test_language.rb b/test/test_language.rb
index fb9cc6d9..6d5029dd 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -242,6 +242,7 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal [Language['Shell']], Language.find_by_filename('.bashrc')
     assert_equal [Language['Shell']], Language.find_by_filename('bash_profile')
     assert_equal [Language['Shell']], Language.find_by_filename('.zshrc')
+    assert_equal [Language['Clojure']], Language.find_by_filename('riemann.config')
   end
 
   def test_find