diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 1e0df216..6a217975 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -566,6 +566,12 @@ Literate Haskell:
   extensions:
   - .lhs
 
+Logtalk:
+  type: programming
+  primary_extension: .lgt
+  extensions:
+  - .lgt
+
 Lua:
   type: programming
   primary_extension: .lua
diff --git a/lib/linguist/mimes.yml b/lib/linguist/mimes.yml
index 399550ea..198a7530 100644
--- a/lib/linguist/mimes.yml
+++ b/lib/linguist/mimes.yml
@@ -53,6 +53,7 @@ application/xaml+xml @xaml :8bit
 image/x-icns @icns
 text/cache-manifest @manifest
 text/plain @cu,cxx
+text/x-logtalk @lgt
 text/x-nemerle @n
 text/x-nimrod @nim
 text/x-ocaml @ml,mli,mll,mly,sig,sml
diff --git a/test/test_blob.rb b/test/test_blob.rb
index 9307d165..177a6fc2 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -274,6 +274,7 @@ class TestBlob < Test::Unit::TestCase
     assert_equal Language['C++'],         blob("hello.cpp").language
     assert_equal Language['C++'],         blob("cuda.cu").language
     assert_equal Language['GAS'],         blob("hello.s").language
+    assert_equal Language['Logtalk'],     blob("foo.lgt").language
     assert_equal Language['Objective-C'], blob("Foo.h").language
     assert_equal Language['Objective-C'], blob("Foo.m").language
     assert_equal Language['Objective-C'], blob("FooAppDelegate.h").language
diff --git a/test/test_mime.rb b/test/test_mime.rb
index 172aa7e9..5cb780be 100644
--- a/test/test_mime.rb
+++ b/test/test_mime.rb
@@ -62,6 +62,7 @@ class TestMime < Test::Unit::TestCase
     assert_equal 'text/plain', Mime.mime_for('.hh')
     assert_equal 'text/plain', Mime.mime_for('.hpp')
     assert_equal 'text/plain', Mime.mime_for('.kt')
+    assert_equal 'text/x-logtalk', Mime.mime_for('.lgt')
     assert_equal 'text/x-rust', Mime.mime_for('.rs')
     assert_equal 'text/x-rust', Mime.mime_for('.rc')
     assert_equal 'video/quicktime', Mime.mime_for('.mov')