diff --git a/lib/linguist/generated.rb b/lib/linguist/generated.rb
index 74dcc498e0..d2887f6429 100644
--- a/lib/linguist/generated.rb
+++ b/lib/linguist/generated.rb
@@ -301,7 +301,7 @@ def generated_go?
       return false unless extname == '.go'
       return false unless lines.count > 1
 
-      return lines[0].include?("Code generated by")
+      return lines.first(10).any? { |l| l.include? "Code generated by" }
     end
 
     PROTOBUF_EXTENSIONS = ['.py', '.java', '.h', '.cc', '.cpp', '.m', '.rb']
@@ -605,7 +605,7 @@ def generated_gamemakerstudio?
       return lines[2].match(/\"modelName\"\:\s*\"GM/) ||
              lines[0] =~ /^\d\.\d\.\d.+\|\{/
     end
-        
+
     # Internal: Is this a generated GIMP C image file?
     #
     # GIMP saves C sources with one of two comment forms:
diff --git a/samples/Go/oapi-codegen.go b/samples/Go/oapi-codegen.go
new file mode 100644
index 0000000000..cfc36400a7
--- /dev/null
+++ b/samples/Go/oapi-codegen.go
@@ -0,0 +1,50 @@
+// Package api provides primitives to interact the openapi HTTP API.
+//
+// Code generated by github.com/deepmap/oapi-codegen DO NOT EDIT.
+package api
+
+// Error defines model for Error.
+type Error struct {
+
+    // Error code
+    Code int32 `json:"code"`
+
+    // Error message
+    Message string `json:"message"`
+}
+
+// NewPet defines model for NewPet.
+type NewPet struct {
+
+    // Name of the pet
+    Name string `json:"name"`
+
+    // Type of the pet
+    Tag *string `json:"tag,omitempty"`
+}
+
+// Pet defines model for Pet.
+type Pet struct {
+    // Embedded struct due to allOf(#/components/schemas/NewPet)
+    NewPet
+    // Embedded fields due to inline allOf schema
+
+    // Unique id of the pet
+    Id int64 `json:"id"`
+}
+
+// FindPetsParams defines parameters for FindPets.
+type FindPetsParams struct {
+
+    // tags to filter by
+    Tags *[]string `json:"tags,omitempty"`
+
+    // maximum number of results to return
+    Limit *int32 `json:"limit,omitempty"`
+}
+
+// AddPetJSONBody defines parameters for AddPet.
+type AddPetJSONBody NewPet
+
+// AddPetRequestBody defines body for AddPet for application/json ContentType.
+type AddPetJSONRequestBody AddPetJSONBody
diff --git a/test/test_blob.rb b/test/test_blob.rb
index fe3709df87..ac1d73d5b6 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -186,6 +186,7 @@ def test_generated
     assert sample_blob_memory("Python/protocol_buffer_pb2.py").generated?
     assert sample_blob_memory("Go/api.pb.go").generated?
     assert sample_blob_memory("Go/embedded.go").generated?
+    assert sample_blob_memory("Go/oapi-codegen.go").generated?
     assert sample_blob_memory("JavaScript/proto.js").generated?
 
     # Apache Thrift generated code
diff --git a/test/test_file_blob.rb b/test/test_file_blob.rb
index c2463df43e..f8b22a6e2e 100644
--- a/test/test_file_blob.rb
+++ b/test/test_file_blob.rb
@@ -227,6 +227,7 @@ def test_generated
     assert sample_blob("Python/protocol_buffer_pb2.py").generated?
     assert sample_blob("Go/api.pb.go").generated?
     assert sample_blob("Go/embedded.go").generated?
+    assert sample_blob("Go/oapi-codegen.go").generated?
 
     # Apache Thrift generated code
     assert sample_blob("Python/gen-py-linguist-thrift.py").generated?