diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index c639d4dc..2567e403 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -819,6 +819,13 @@ Nemerle:
   color: "#0d3c6e"
   primary_extension: .n
 
+Nginx:
+  type: markup
+  lexer: Nginx configuration file
+  primary_extension: .conf
+  filenames:
+  - nginx.conf
+
 Nimrod:
   type: programming
   color: "#37775b"
diff --git a/test/test_language.rb b/test/test_language.rb
index 14b39f7e..7e5d3ee5 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -233,6 +233,7 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal [Language['Ruby']], Language.find_by_filename('PKGBUILD.rb')
     assert_equal Language['ApacheConf'], Language.find_by_filename('httpd.conf').first
     assert_equal [Language['ApacheConf']], Language.find_by_filename('.htaccess')
+    assert_equal Language['Nginx'], Language.find_by_filename('nginx.conf').first
     assert_equal ['C', 'C++', 'Objective-C'], Language.find_by_filename('foo.h').map(&:name).sort
     assert_equal [], Language.find_by_filename('rb')
     assert_equal [], Language.find_by_filename('.rb')