diff --git a/cockroach/Makefile b/cockroach/Makefile
new file mode 100644
index 0000000000..4d55e93e13
--- /dev/null
+++ b/cockroach/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD$
+
+DISTNAME=       cockroach-v20.2.2.src
+PKGNAME=        ${DISTNAME:S/.src//}
+CATEGORIES=     databases
+MASTER_SITES=   https://binaries.cockroachdb.com/
+EXTRACT_SUFX=   .tgz
+
+MAINTAINER=     pkgsrc-users@NetBSD.org
+HOMEPAGE=       https://www.cockroachlabs.com/product/
+COMMENT=        CockroachDB is a cloud-native SQL database for building global, scalable cloud services that survive disasters.
+LICENSE=        apache-2.0
+
+USE_LANGUAGES=	c c++
+
+GO_SRCPATH=	github.com/cockroachdb/cockroach
+GO_DIST_BASE=	${PKGNAME}
+
+USE_TOOLS+=     gmake bash:run autoconf
+CHECK_PORTABILITY_SKIP+= src/github.com/cockroachdb/cockroach/c-deps/protobuf/post_process_dist.sh
+
+MAKE_ENV+=	GO=${GO} GOPATH=${WRKDIR}
+BUILD_TARGET=	buildoss
+
+do-build:
+	cd ${WRKSRC}/src/${GO_SRCPATH} && ${MAKE_ENV} ${GMAKE} ${BUILD_TARGET}
+
+DEPENDS+=       cmake>=3.17:../../devel/cmake
+
+.include "../../lang/go/go-package.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/cockroach/PLIST b/cockroach/PLIST
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cockroach/distinfo b/cockroach/distinfo
new file mode 100644
index 0000000000..747942dccb
--- /dev/null
+++ b/cockroach/distinfo
@@ -0,0 +1,7 @@
+$NetBSD$
+
+SHA1 (cockroach-v20.2.2.src.tgz) = f26bcda06c9331eedfdf7f6ec4cbbe7f58826cc9
+RMD160 (cockroach-v20.2.2.src.tgz) = 9a0851f06b001ae9bbcacdb145475683a9be453f
+SHA512 (cockroach-v20.2.2.src.tgz) = 48e940108f691bf62d68ce916ade22627c947f1270bcf07a5d383b730039e0fb14788db5ea9c870005b834bc1d2750d400e41afa9ac27dc9cc6687173f0faa89
+Size (cockroach-v20.2.2.src.tgz) = 290416644 bytes
+SHA1 (patch-src_github.com_cockroachdb_cockroach_Makefile) = 6616e8c00215b2aab4e450df377a1edd92836b5c
diff --git a/cockroach/patches/patch-src_github.com_cockroachdb_cockroach_Makefile b/cockroach/patches/patch-src_github.com_cockroachdb_cockroach_Makefile
new file mode 100644
index 0000000000..c986f8f7a2
--- /dev/null
+++ b/cockroach/patches/patch-src_github.com_cockroachdb_cockroach_Makefile
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Stop checking every environment variable.
+
+--- src/github.com/cockroachdb/cockroach/Makefile.orig	2020-11-25 14:36:31.000000000 +0000
++++ src/github.com/cockroachdb/cockroach/Makefile
+@@ -1834,5 +1834,5 @@ build/variables.mk: Makefile build/archi
+ # any environment variable becomes a make variable and environments
+ # are dirty. For instance, my includes GREP_COLOR.
+ include build/variables.mk
+-$(foreach v,$(filter-out $(strip $(VALID_VARS)),$(.VARIABLES)),\
+-	$(if $(findstring command line,$(origin $v)),$(error Variable '$v' is not recognized by this Makefile)))
++#$(foreach v,$(filter-out $(strip $(VALID_VARS)),$(.VARIABLES)),\
++#	$(if $(findstring command line,$(origin $v)),$(error Variable '$v' is not recognized by this Makefile)))