diff --git a/lib/linguist/generated.rb b/lib/linguist/generated.rb
index fd6a9e76..a9ca4914 100644
--- a/lib/linguist/generated.rb
+++ b/lib/linguist/generated.rb
@@ -310,9 +310,7 @@ module Linguist
     #
     # Returns true or false.
     def go_vendor?
-      return false unless extname == '.go'
-
-      !!name.match(/\Avendor\//)
+      !!name.match(/vendor\/((?!-)[-0-9A-Za-z]+(?<!-)\.)+(com|edu|gov|in|me|net|org|fm|io)/)
     end
 
     # Internal: Is the blob a generated npm shrinkwrap file.
diff --git a/test/test_generated.rb b/test/test_generated.rb
index d34f605b..db32e8f5 100644
--- a/test/test_generated.rb
+++ b/test/test_generated.rb
@@ -42,6 +42,11 @@ class TestGenerated < Minitest::Test
     generated_sample_without_loading_data("Dummy/foo.xcworkspacedata")
     generated_sample_without_loading_data("Dummy/foo.xcuserstate")
 
+    # Go-specific vendored paths
+    generated_sample_without_loading_data("go/vendor/github.com/foo.go")
+    generated_sample_without_loading_data("go/vendor/golang.org/src/foo.c")
+    generated_sample_without_loading_data("go/vendor/gopkg.in/some/nested/path/foo.go")
+
     # .NET designer file
     generated_sample_without_loading_data("Dummu/foo.designer.cs")