diff --git a/common/shlibs b/common/shlibs
index 83fabf2a94e..e22fc3d561e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2003,7 +2003,7 @@ libopenconnect.so.5 openconnect-7.05_1
 libusbredirparser.so.1 usbredir-0.7_1
 libusbredirhost.so.1 usbredir-0.7_1
 libprotobuf-c.so.1 protobuf-c-1.1.0_1
-libutf8proc.so.1 libutf8proc-1.1.6_1
+libutf8proc.so.2 libutf8proc-2.2.0_1
 libnsutils.so.0 libnsutils-0.0.1_1
 libtoxcore.so.2 toxcore-0.2.0_1
 libgom-1.0.so.0 gom-0.3.0_1
diff --git a/srcpkgs/libutf8proc/files/libutf8proc.pc.in b/srcpkgs/libutf8proc/files/libutf8proc.pc.in
new file mode 100644
index 00000000000..c59a78a1831
--- /dev/null
+++ b/srcpkgs/libutf8proc/files/libutf8proc.pc.in
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libutf8proc
+Description: UTF8 processing
+Version: @VERSION@
+Libs: -L${libdir} -lutf8proc
+Cflags: -I${includedir} -DUTF8PROC_EXPORTS
diff --git a/srcpkgs/libutf8proc/template b/srcpkgs/libutf8proc/template
index cd328d25fd1..c5d82dbbeca 100644
--- a/srcpkgs/libutf8proc/template
+++ b/srcpkgs/libutf8proc/template
@@ -1,26 +1,25 @@
-# Template build file for 'libutf8proc'.
+# Template file for 'libutf8proc'
 pkgname=libutf8proc
-version=1.3.1
-revision=2
-_realversion=1.3.1-3
+version=2.2.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config perl netsurf-buildsystem"
 short_desc="C library for processing UTF-8 encoded Unicode strings"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="MIT"
 homepage="http://www.netsurf-browser.org"
-distfiles="http://git.netsurf-browser.org/$pkgname.git/snapshot/$pkgname-release/${_realversion}.tar.bz2"
-checksum=ce1f428849ee1e733e7b28ffa7b2680d901ba3ce1e703fd154e9fce5b0a54d07
-wrksrc=libutf8proc-release
-build_wrksrc=${_realversion}
+distfiles="http://git.netsurf-browser.org/libutf8proc.git/snapshot/libutf8proc-${version}.tar.gz"
+checksum=9013e33d3f0f21d0e393fc37ce59c573857d8c39e04e33654b7ea9511cae52c3
 
-do_build() {
-	make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-shared PREFIX=/usr
-	make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-static PREFIX=/usr
-}
+post_install() {
+	vmkdir usr/lib/pkgconfig
+	sed "s|@VERSION@|${version}|" \
+		${FILESDIR}/libutf8proc.pc.in > ${DESTDIR}/usr/lib/pkgconfig/libutf8proc.pc
 
-do_install() {
-	make COMPONENT_TYPE=lib-shared PREFIX=/usr DESTDIR=${DESTDIR} install
-	make COMPONENT_TYPE=lib-static PREFIX=/usr DESTDIR=${DESTDIR} install
+	# Fix headers
+	vmkdir usr/include/libutf8proc
+	mv ${DESTDIR}/usr/include/utf8proc.h ${DESTDIR}/usr/include/libutf8proc/
 
 	vlicense LICENSE.md
 }
@@ -31,7 +30,6 @@ libutf8proc-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/libutf8proc/update b/srcpkgs/libutf8proc/update
index f70ecd94805..4e6de75199a 100644
--- a/srcpkgs/libutf8proc/update
+++ b/srcpkgs/libutf8proc/update
@@ -1,2 +1 @@
-site="http://git.netsurf-browser.org/libutf8proc.git"
-pattern="release/\K[\d.]+(?=\.tar)"
+site=http://git.netsurf-browser.org/libutf8proc.git/refs/