diff --git a/astro/libosmpbf/Makefile b/astro/libosmpbf/Makefile
index 0b57580847d4..ef91f55e6cde 100644
--- a/astro/libosmpbf/Makefile
+++ b/astro/libosmpbf/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	libosmpbf
 PORTVERSION=	1.5.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	5
 CATEGORIES=	astro geography devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Library for handling binary OpenStreetMap data
 WWW=		https://github.com/scrosby/OSM-binary
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	scrosby
 GH_PROJECT=	OSM-binary
 
-USES=		cmake compiler:c++11-lang
-USE_CXXSTD=	c++11
+USES=		cmake compiler:c++17-lang
+USE_CXXSTD=	c++17
 
 .include <bsd.port.mk>
diff --git a/astro/libosmpbf/files/patch-protobuf b/astro/libosmpbf/files/patch-protobuf
new file mode 100644
index 000000000000..499906ee3407
--- /dev/null
+++ b/astro/libosmpbf/files/patch-protobuf
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2021-01-06 13:47:22 UTC
++++ CMakeLists.txt
+@@ -4,7 +4,7 @@ project(osmpbf VERSION 1.5.0)
+ 
+ include(GNUInstallDirs)
+ 
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
+ 
+ find_package(Protobuf REQUIRED)
+