diff --git a/lib/linguist/mimes.yml b/lib/linguist/mimes.yml
index 5a65dce5..c2ddb323 100644
--- a/lib/linguist/mimes.yml
+++ b/lib/linguist/mimes.yml
@@ -6,7 +6,7 @@
 #   https://github.com/halostatue/mime-types/blob/master/lib/mime/types.rb.data
 
 # TODO: Lookup actual types
-application/octet-stream @a,blend,gem,graffle,ipa,lib,mcz,nib,o,odp,ods,odt,otf,ogv,pfx,pigx,plgx,pptx,psd,sib,spl,sqlite3,swc,ucode,xpi
+application/octet-stream @a,blend,gem,graffle,ipa,lib,mcz,nib,o,ogv,otf,pfx,pigx,plgx,psd,sib,spl,sqlite3,swc,ucode,xpi
 
 application/java-archive @ear,war
 application/netcdf :8bit
@@ -14,6 +14,11 @@ application/ogg @ogg
 application/postscript :base64
 application/vnd.adobe.air-application-installer-package+zip @air
 application/vnd.mozilla.xul+xml :8bit
+application/vnd.oasis.opendocument.presentation @odp
+application/vnd.oasis.opendocument.spreadsheet @ods
+application/vnd.oasis.opendocument.text @odt
+application/vnd.openofficeorg.extension @oxt
+application/vnd.openxmlformats-officedocument.presentationml.presentation @pptx
 application/x-chrome-extension @crx
 application/x-ms-xbap @xbap :8bit
 application/x-pagemaker @-pm
diff --git a/test/test_mime.rb b/test/test_mime.rb
index c010d260..8322cb1d 100644
--- a/test/test_mime.rb
+++ b/test/test_mime.rb
@@ -32,6 +32,13 @@ class TestMime < Test::Unit::TestCase
     assert_equal 'application/xaml+xml', Mime.mime_for(".xaml")
     assert_equal 'application/ms-xbap', Mime.mime_for(".xbap")
 
+    assert_equal 'application/vnd.oasis.opendocument.presentation', Mime.mime_for(".odp")
+    assert_equal 'application/vnd.oasis.opendocument.spreadsheet', Mime.mime_for(".ods")
+    assert_equal 'application/vnd.oasis.opendocument.text', Mime.mime_for(".odt")
+    assert_equal 'application/vnd.openofficeorg.extension', Mime.mime_for(".oxt")
+    assert_equal 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+      Mime.mime_for(".pptx")
+
     assert_equal 'video/quicktime', Mime.mime_for(".mov")
 
     assert_equal 'application/postscript', Mime.mime_for(".ai")