diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 1ca28260..9b85c48a 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -527,6 +527,11 @@ Myghty:
   extensions:
   - .myt
 
+Nemerle:
+  type: programming
+  extensions:
+  - .n
+
 Nimrod:
   extensions:
   - .nim
diff --git a/lib/linguist/mimes.yml b/lib/linguist/mimes.yml
index f8e561a3..2f726f36 100644
--- a/lib/linguist/mimes.yml
+++ b/lib/linguist/mimes.yml
@@ -54,4 +54,5 @@ text/cache-manifest @manifest
 text/plain @cu,cxx
 text/x-nimrod @nim
 text/x-ocaml @ml,mli,mll,mly,sig,sml
+text/x-nemerle @n
 text/x-scheme @rkt,scm,sls,sps,ss
diff --git a/test/fixtures/hello.n b/test/fixtures/hello.n
new file mode 100644
index 00000000..7d367146
--- /dev/null
+++ b/test/fixtures/hello.n
@@ -0,0 +1,9 @@
+using System.Console;
+
+module Program
+{
+   Main() : void
+   {
+     WriteLine("Hello world");
+   }
+}
\ No newline at end of file
diff --git a/test/test_blob.rb b/test/test_blob.rb
index 1f4f40be..42d573e1 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -293,6 +293,9 @@ class TestBlob < Test::Unit::TestCase
     # https://github.com/googleapi/googleapi/blob/master/demos/gmail_demo/gmail.dpr
     assert_equal Language['Delphi'], blob("program.dpr").language
 
+    # https://github.com/philiplaureano/Nemerle.FizzBuzz/blob/master/FizzBuzz/FizzBuzzer.n
+    assert_equal Language['Nemerle'], blob("hello.n").language
+
     # https://github.com/dharmatech/agave/blob/master/demos/asteroids.sps
     assert_equal Language['Scheme'], blob("asteroids.sps").language
   end
diff --git a/test/test_mime.rb b/test/test_mime.rb
index a97351ef..420f02c4 100644
--- a/test/test_mime.rb
+++ b/test/test_mime.rb
@@ -48,6 +48,7 @@ class TestMime < Test::Unit::TestCase
     assert_equal 'application/xaml+xml', Mime.mime_for('.xaml')
     assert_equal 'text/cache-manifest', Mime.mime_for('.manifest')
     assert_equal 'text/html', Mime.mime_for('.html')
+    assert_equal 'text/nemerle', Mime.mime_for('.n')
     assert_equal 'text/nimrod', Mime.mime_for('.nim')
     assert_equal 'text/ocaml', Mime.mime_for('.ml')
     assert_equal 'text/ocaml', Mime.mime_for('.sig')
@@ -156,6 +157,7 @@ class TestMime < Test::Unit::TestCase
     assert Mime.text?('text/javascript')
     assert Mime.text?('text/plain')
     assert Mime.text?('text/x-nimrod')
+    assert Mime.text?('text/x-nemerle')
 
     # Legacy. Prefer testing mime types instead of extensions.
     assert Mime.text?('.cu')