diff --git a/devel/utf8cpp/Makefile b/devel/utf8cpp/Makefile
index 38177b3df620..90bb221cc6ad 100644
--- a/devel/utf8cpp/Makefile
+++ b/devel/utf8cpp/Makefile
@@ -2,26 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	utf8cpp
-PORTVERSION=	2.3.4
+PORTVERSION=	3.1.2
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
-MASTER_SITES=	SF/utfcpp/${PORTNAME:tl}_2x/Release%20${PORTVERSION}/
-DISTNAME=	utf8_v${PORTVERSION:S/./_/g}
 
 MAINTAINER=	k@stereochro.me
 COMMENT=	Simple, portable, lightweight library for handling UTF-8 strings
 
 LICENSE=	BSL
 
-USES=		zip
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
+USES=		cmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	nemtrif
+GH_PROJECT=	utfcpp
 
-PLIST_FILES=	include/utf8.h \
-		include/utf8/checked.h \
-		include/utf8/core.h \
-		include/utf8/unchecked.h
-
-do-install:
-	(cd ${WRKSRC}/source; ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include)
+PLIST_FILES=	include/utf8cpp/utf8.h \
+		include/utf8cpp/utf8/checked.h \
+		include/utf8cpp/utf8/core.h \
+		include/utf8cpp/utf8/cpp11.h \
+		include/utf8cpp/utf8/unchecked.h \
+		lib/cmake/utf8cpp/utf8cppConfig.cmake
 
 .include <bsd.port.mk>
diff --git a/devel/utf8cpp/distinfo b/devel/utf8cpp/distinfo
index 33abdb1b7ded..c09a94212e45 100644
--- a/devel/utf8cpp/distinfo
+++ b/devel/utf8cpp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (utf8_v2_3_4.zip) = 3373cebb25d88c662a2b960c4d585daf9ae7b396031ecd786e7bb31b15d010ef
-SIZE (utf8_v2_3_4.zip) = 22422
+TIMESTAMP = 1606387752
+SHA256 (nemtrif-utfcpp-v3.1.2_GH0.tar.gz) = fea3bfa39fb8bd7368077ea5e1e0db9a8951f7e6fb6d9400b00ab3d92b807c6d
+SIZE (nemtrif-utfcpp-v3.1.2_GH0.tar.gz) = 26388
diff --git a/devel/utf8cpp/files/patch-CMakeLists.txt b/devel/utf8cpp/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..2a90a140552a
--- /dev/null
+++ b/devel/utf8cpp/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2020-09-27 18:26:57 UTC
++++ CMakeLists.txt
+@@ -36,7 +36,7 @@ if(UTF8_SAMPLES)
+     target_link_libraries(docsample PRIVATE utf8::cpp)
+ endif()
+ 
+-if(UTF8_TESTS)
++if(0)
+     enable_testing()
+     add_subdirectory(extern/gtest)
+     add_subdirectory(tests)