diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index e0f515a0..f4b2c86f 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -338,6 +338,9 @@ Moocode:
 Myghty:
   :ext:
   - .myt
+Nimrod:
+  :ext:
+  - .nim
 Nu:
   :lexer: scheme
   :aliases:
diff --git a/lib/linguist/mimes.yml b/lib/linguist/mimes.yml
index c2ddb323..0fff5f52 100644
--- a/lib/linguist/mimes.yml
+++ b/lib/linguist/mimes.yml
@@ -29,3 +29,5 @@ application/x-wais-source :8bit
 application/xaml+xml @xaml :8bit
 image/x-icns @icns
 text/cache-manifest @manifest
+text/x-nimrod @nim :8bit
+video/vnd.nokia.interleaved-multimedia @-nim
diff --git a/test/test_blob.rb b/test/test_blob.rb
index 68082d35..5872326b 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -242,6 +242,9 @@ class TestBlob < Test::Unit::TestCase
     # https://github.com/wycats/osx-window-sizing/blob/master/center.applescript
     assert_equal Language['AppleScript'], blob("center.scpt").language
     assert_equal Language['AppleScript'], blob("center.applescript").language
+
+    # https://github.com/Araq/Nimrod/tree/master/examples
+    assert_equal Language['Nimrod'], blob("foo.nim").language
   end
 
   def test_lexer
diff --git a/test/test_language.rb b/test/test_language.rb
index dcc31ab8..d22920c2 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -251,6 +251,7 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal Lexer['Ruby'],              Language['Mirah'].lexer
     assert_equal Lexer['Moocode'],           Language['Moocode'].lexer
     assert_equal Lexer['Myghty'],            Language['Myghty'].lexer
+    assert_equal Lexer['Nimrod'],            Language['Nimrod'].lexer
     assert_equal Lexer['Scheme'],            Language['Nu'].lexer
     assert_equal Lexer['NumPy'],             Language['NumPy'].lexer
     assert_equal Lexer['OCaml'],             Language['OCaml'].lexer
diff --git a/test/test_mime.rb b/test/test_mime.rb
index 8322cb1d..d89bf372 100644
--- a/test/test_mime.rb
+++ b/test/test_mime.rb
@@ -15,9 +15,10 @@ class TestMime < Test::Unit::TestCase
     assert_equal 'application/python', Mime.mime_for(".py")
     assert_equal 'application/ruby', Mime.mime_for(".rb")
 
-    assert_equal 'text/plain', Mime.mime_for(".kt")
-    assert_equal 'text/html', Mime.mime_for(".html")
     assert_equal 'text/cache-manifest', Mime.mime_for(".manifest")
+    assert_equal 'text/html', Mime.mime_for(".html")
+    assert_equal 'text/nimrod', Mime.mime_for(".nim")
+    assert_equal 'text/plain', Mime.mime_for(".kt")
     assert_equal 'application/sh', Mime.mime_for(".sh")
     assert_equal 'application/latex', Mime.mime_for(".latex")
 
@@ -133,6 +134,7 @@ class TestMime < Test::Unit::TestCase
     assert !Mime.binary?("text/html")
     assert !Mime.binary?("text/javascript")
     assert !Mime.binary?("text/plain")
+    assert !Mime.binary?("text/x-nimrod")
 
     assert !Mime.binary?(".js")
     assert !Mime.binary?(".latex")