diff --git a/common/shlibs b/common/shlibs
index 72d2209ec72..3b360fe7c23 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2886,9 +2886,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1
 libm17n-gui.so.0 m17n-lib-1.7.0_1
 libm17n-core.so.0 m17n-lib-1.7.0_1
 libm17n.so.0 m17n-lib-1.7.0_1
-libprotobuf-lite.so.17 protobuf-lite-3.6.1_1
-libprotoc.so.17 protobuf-3.6.1_1
-libprotobuf.so.17 protobuf-3.6.1_1
+libprotobuf-lite.so.18 libprotobuf-lite18-3.7.0_1
+libprotoc.so.18 libprotoc18-3.7.0_1
+libprotobuf.so.18 libprotobuf18-3.7.0_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/libprotobuf-lite18 b/srcpkgs/libprotobuf-lite18
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/libprotobuf-lite18
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf18 b/srcpkgs/libprotobuf18
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/libprotobuf18
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/libprotoc-devel
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotoc18 b/srcpkgs/libprotoc18
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/libprotoc18
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 3edd30da041..e583fc02b27 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,19 +1,17 @@
 # Template file for 'protobuf'
 pkgname=protobuf
-version=3.6.1.3
+version=3.7.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
+hostmakedepends="pkg-config"
 makedepends="zlib-devel"
-short_desc="Google's data interchange format"
+short_desc="Protocol buffers compiler"
 maintainer="Michael Aldridge <maldridge@voidlinux.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/google/protobuf/archive/v${version}.tar.gz"
-checksum=73fdad358857e120fd0fa19e071a96e15c0f23bb25f85d3f7009abfd4f264a2a
-
-CXXFLAGS="-std=c++14"
+distfiles="https://github.com/protocolbuffers/protobuf/releases/download/v${version}/protobuf-all-${version}.tar.gz"
+checksum=3e933375ecc58d01e52705479b82f155aea2d02cc55d833f8773213e74f88363
 
 if [ "$CROSS_BUILD" ]; then
 	# needs host protoc
@@ -28,29 +26,62 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -fi
-}
-
 post_install() {
 	vlicense LICENSE
 }
 
+libprotobuf18_package() {
+	short_desc="Protocol buffers C++ library"
+	pkg_install() {
+		vmove "usr/lib/libprotobuf.so.*"
+		vlicense LICENSE
+	}
+}
+
+libprotobuf-lite18_package() {
+	short_desc="Protocol buffers C++ library (lite version)"
+	pkg_install() {
+		vmove "usr/lib/libprotobuf-lite.so.*"
+		vlicense LICENSE
+	}
+}
+
+libprotoc18_package() {
+	short_desc="Protocol buffers compiler library"
+	pkg_install() {
+		vmove "usr/lib/libprotoc*.so.*"
+		vlicense LICENSE
+	}
+}
+
+libprotoc-devel_package() {
+	depends="libprotoc18-${version}_${revision}"
+	short_desc="Protocol buffers compiler library - development files"
+	pkg_install() {
+		vmove usr/lib/libprotoc.a
+		vmove usr/lib/libprotoc.so
+		vmove usr/include/google/protobuf/compiler
+	}
+}
+
 protobuf-devel_package() {
-	depends="zlib-devel protobuf-${version}_${revision}
-	 protobuf-lite-${version}_${revision}"
-	short_desc+=" - development files"
+	depends="zlib-devel
+	 libprotobuf18-${version}_${revision}
+	 libprotobuf-lite18-${version}_${revision}"
+	short_desc+="Protocol buffers C++ library - development files"
 	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
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
 	}
 }
 
 protobuf-lite_package() {
-	short_desc+=" - Lite version"
-	pkg_install() {
-		vmove "usr/lib/libprotobuf-lite.so.*"
-	}
+	build_style=meta
+	short_desc="Protocol buffers C++ library (lite version)"
+	depends="libprotobuf-lite18-${version}_${revision}"
+	archs=noarch
 }