diff --git a/lib/linguist/documentation.yml b/lib/linguist/documentation.yml
index b884cd35..6e06329f 100644
--- a/lib/linguist/documentation.yml
+++ b/lib/linguist/documentation.yml
@@ -7,10 +7,14 @@
 # Please add additional test coverage to
 # `test/test_blob.rb#test_documentation` if you make any changes.
 
-## Documentation Conventions ##
+## Documentation directories ##
 
 - ^docs?/
-- ^Documentation/
+- (^|/)[Dd]ocumentation/
+- (^|/)javadoc/
+- ^man/
+
+## Documentation files ##
 
 - (^|/)CONTRIBUTING(\.|$)
 - (^|/)COPYING(\.|$)
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index bca601eb..0ac757f6 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -3165,7 +3165,7 @@ XC:
   ace_mode: c_cpp
 
 XML:
-  type: markup
+  type: data
   ace_mode: xml
   aliases:
   - rss
diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml
index 9f6b401b..0384a7db 100644
--- a/lib/linguist/vendor.yml
+++ b/lib/linguist/vendor.yml
@@ -251,3 +251,6 @@
 # ProGuard
 - proguard.pro
 - proguard-rules.pro
+
+# Android Google APIs
+- (^|/)\.google_apis/
diff --git a/test/test_blob.rb b/test/test_blob.rb
index d59e6794..022eb20b 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -439,6 +439,9 @@ class TestBlob < Minitest::Test
     assert sample_blob("activator.bat").vendored?
     assert sample_blob("subproject/activator").vendored?
     assert sample_blob("subproject/activator.bat").vendored?
+
+    assert_predicate fixture_blob(".google_apis/bar.jar"), :vendored?
+    assert_predicate fixture_blob("foo/.google_apis/bar.jar"), :vendored?
   end
 
   def test_documentation
@@ -448,7 +451,15 @@ class TestBlob < Minitest::Test
     refute_predicate fixture_blob("project/docs/foo.html"), :documentation?
 
     assert_predicate fixture_blob("Documentation/foo.md"), :documentation?
-    refute_predicate fixture_blob("project/Documentation/foo.md"), :documentation?
+    assert_predicate fixture_blob("documentation/foo.md"), :documentation?
+    assert_predicate fixture_blob("project/Documentation/foo.md"), :documentation?
+    assert_predicate fixture_blob("project/documentation/foo.md"), :documentation?
+
+    assert_predicate fixture_blob("javadoc/foo.html"), :documentation?
+    assert_predicate fixture_blob("project/javadoc/foo.html"), :documentation?
+
+    assert_predicate fixture_blob("man/foo.html"), :documentation?
+    refute_predicate fixture_blob("project/man/foo.html"), :documentation?
 
     assert_predicate fixture_blob("README"), :documentation?
     assert_predicate fixture_blob("README.md"), :documentation?