diff --git a/third_party/go/patches/go-proto-validators-default-alias.patch b/third_party/go/patches/go-proto-validators-default-alias.patch
new file mode 100644
index 0000000..46f21a9
--- /dev/null
+++ b/third_party/go/patches/go-proto-validators-default-alias.patch
@@ -0,0 +1,29 @@
+From 49b5f957d01cd50e5303cfc0e6c7f350d7e1c24e Mon Sep 17 00:00:00 2001
+From: Lorenz Brun <lorenz@monogon.tech>
+Date: Tue, 30 Nov 2021 03:19:37 +0100
+Subject: [PATCH] Alias go_default_library in BUILD to make Gazelle work
+
+---
+ BUILD.bazel | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/BUILD.bazel b/BUILD.bazel
+index 9a1edd4..e5b8f96 100644
+--- a/BUILD.bazel
++++ b/BUILD.bazel
+@@ -14,6 +14,12 @@ gazelle(
+ # By default resolve the top-level package to the gogo variant as it's required for the plugin compilation.
+ # gazelle:resolve go github.com/mwitkow/go-proto-validators //:validators_gogo
+ 
++alias(
++    name = "go_default_library",
++    actual = "validators_golang",
++    visibility = ["//visibility:public"],
++)
++
+ go_proto_compiler(
+     name = "go_proto_validators",
+     options = ["gogoimport=false"],
+-- 
+2.25.1
+
diff --git a/third_party/go/patches/protoc-gen-doc-no-gogo.patch b/third_party/go/patches/protoc-gen-doc-no-gogo.patch
new file mode 100644
index 0000000..8f2650e
--- /dev/null
+++ b/third_party/go/patches/protoc-gen-doc-no-gogo.patch
@@ -0,0 +1,46 @@
+From 3ec1e2168d64d880231c7bc3b022ac6e6ef342ad Mon Sep 17 00:00:00 2001
+From: Lorenz Brun <lorenz@monogon.tech>
+Date: Tue, 30 Nov 2021 03:40:11 +0100
+Subject: [PATCH] Remove gogo compatibility hack
+
+We build the whole thing with Bazel so the protobuf generated code uses
+the correct runtime support library by definition.
+---
+ extensions/validator_field/validator_field.go | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/extensions/validator_field/validator_field.go b/extensions/validator_field/validator_field.go
+index 224e414..0e2d8fb 100644
+--- a/extensions/validator_field/validator_field.go
++++ b/extensions/validator_field/validator_field.go
+@@ -5,27 +5,10 @@ import (
+ 	"reflect"
+ 	"strings"
+ 
+-	"github.com/golang/protobuf/proto"
+-	"github.com/golang/protobuf/protoc-gen-go/descriptor"
+ 	validator "github.com/mwitkow/go-proto-validators"
+ 	"github.com/pseudomuto/protoc-gen-doc/extensions"
+ )
+ 
+-func init() {
+-	// NOTE: mwitkow/go-proto-validators uses gogo/profobuf/proto and therefore
+-	// only registers the extension under gogo. We need to register it under
+-	// golang/protobuf/proto with the same properties, except using the
+-	// golang/protobuf FieldOptions descriptor.
+-	proto.RegisterExtension(&proto.ExtensionDesc{
+-		ExtendedType:  (*descriptor.FieldOptions)(nil),
+-		ExtensionType: validator.E_Field.ExtensionType,
+-		Field:         validator.E_Field.Field,
+-		Name:          validator.E_Field.Name,
+-		Tag:           validator.E_Field.Tag,
+-		Filename:      validator.E_Field.Filename,
+-	})
+-}
+-
+ // ValidatorRule represents a single validator rule from the (validator.field) method option extension.
+ type ValidatorRule struct {
+ 	Name  string      `json:"name"`
+-- 
+2.25.1
+