diff --git a/common/shlibs b/common/shlibs
index 4f3f7197ea..6fe3715505 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3072,6 +3072,9 @@ libm17n.so.0 m17n-lib-1.7.0_1
 libprotobuf-lite.so.22 libprotobuf22-lite-3.11.2_1
 libprotoc.so.22 libprotoc22-3.11.2_1
 libprotobuf.so.22 libprotobuf22-3.11.2_1
+libprotobuf-lite.so.23 libprotobuf23-lite-3.12.1_1
+libprotoc.so.23 libprotoc23-3.12.1_1
+libprotobuf.so.23 libprotobuf23-3.12.1_1
 libsombok.so.3 sombok-2.4.0_1
 libdeviceclient.so.0 pragha-1.3.3_1
 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1
diff --git a/srcpkgs/libprotobuf23 b/srcpkgs/libprotobuf23
new file mode 120000
index 0000000000..519d8fd312
--- /dev/null
+++ b/srcpkgs/libprotobuf23
@@ -0,0 +1 @@
+protobuf23
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf23-lite b/srcpkgs/libprotobuf23-lite
new file mode 120000
index 0000000000..519d8fd312
--- /dev/null
+++ b/srcpkgs/libprotobuf23-lite
@@ -0,0 +1 @@
+protobuf23
\ No newline at end of file
diff --git a/srcpkgs/libprotoc23 b/srcpkgs/libprotoc23
new file mode 120000
index 0000000000..519d8fd312
--- /dev/null
+++ b/srcpkgs/libprotoc23
@@ -0,0 +1 @@
+protobuf23
\ No newline at end of file
diff --git a/srcpkgs/libprotoc23-devel b/srcpkgs/libprotoc23-devel
new file mode 120000
index 0000000000..519d8fd312
--- /dev/null
+++ b/srcpkgs/libprotoc23-devel
@@ -0,0 +1 @@
+protobuf23
\ No newline at end of file
diff --git a/srcpkgs/protobuf23-devel b/srcpkgs/protobuf23-devel
new file mode 120000
index 0000000000..519d8fd312
--- /dev/null
+++ b/srcpkgs/protobuf23-devel
@@ -0,0 +1 @@
+protobuf23
\ No newline at end of file
diff --git a/srcpkgs/protobuf23/template b/srcpkgs/protobuf23/template
new file mode 100644
index 0000000000..22a58a5a7e
--- /dev/null
+++ b/srcpkgs/protobuf23/template
@@ -0,0 +1,98 @@
+# Template file for 'protobuf23'
+pkgname=protobuf23
+version=3.12.1
+revision=1
+wrksrc="protobuf-${version}"
+build_style=gnu-configure
+hostmakedepends="pkg-config automake libtool"
+makedepends="zlib-devel"
+short_desc="Protocol buffers compiler"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://developers.google.com/protocol-buffers/"
+changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
+distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
+checksum=cb9b3f9d625b5739a358268eb3421de11cacd90025f5f7672c3930553eca810e
+
+# Switch to versioned package
+replaces="protobuf<=3.11.4_1"
+conflicts="protobuf18>=0"
+
+if [ "$CROSS_BUILD" ]; then
+	# needs host protoc
+	hostmakedepends+=" ${pkgname}"
+	configure_args+=" --with-protoc=/usr/bin/protoc"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LDFLAGS+=" -latomic"
+fi
+
+pre_configure() {
+	autoreconf -fi
+}
+
+do_configure() {
+	# configure doesn't set proper linker flags when discovering pthread
+	PTHREAD_LIBS="-pthread" PTHREAD_CFLAGS="-pthread" ./configure ${configure_args}
+}
+
+post_install() {
+	vlicense LICENSE
+}
+
+libprotobuf23_package() {
+	short_desc="Protocol buffers C++ library"
+	pkg_install() {
+		vmove "usr/lib/libprotobuf.so.*"
+		vlicense LICENSE
+	}
+}
+
+libprotobuf23-lite_package() {
+	short_desc="Protocol buffers C++ library (lite version)"
+	pkg_install() {
+		vmove "usr/lib/libprotobuf-lite.so.*"
+		vlicense LICENSE
+	}
+}
+
+libprotoc23_package() {
+	short_desc="Protocol buffers compiler library"
+	pkg_install() {
+		vmove "usr/lib/libprotoc*.so.*"
+		vlicense LICENSE
+	}
+}
+
+libprotoc23-devel_package() {
+	depends="libprotoc23-${version}_${revision}"
+	short_desc="Protocol buffers compiler library - development files"
+	# Switch to versioned package
+	replaces="libprotoc-devel<=3.11.4_1"
+	conflicts="libprotoc18-devel>=0"
+	pkg_install() {
+		vmove usr/lib/libprotoc.a
+		vmove usr/lib/libprotoc.so
+		vmove usr/include/google/protobuf/compiler
+	}
+}
+
+protobuf23-devel_package() {
+	depends="zlib-devel
+	 libprotobuf23-${version}_${revision}
+	 libprotobuf23-lite-${version}_${revision}"
+	short_desc="Protocol buffers C++ library - development files"
+	# Switch to versioned package
+	replaces="protobuf-devel<=3.11.4_1"
+	conflicts="protobuf18-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/libprotobuf.a
+		vmove usr/lib/libprotobuf-lite.a
+		vmove usr/lib/libprotobuf.so
+		vmove usr/lib/libprotobuf-lite.so
+		vmove usr/lib/pkgconfig
+	}
+}