diff --git a/devel/jsonnet/Makefile b/devel/jsonnet/Makefile
index 1da6097367ee..ba3db87e5c1d 100644
--- a/devel/jsonnet/Makefile
+++ b/devel/jsonnet/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	jsonnet
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.18.0
+DISTVERSION=	0.20.0
 CATEGORIES=	devel
 
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	JSON data templating language
 WWW=		https://jsonnet.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nlohmann-json>=3.6.1:devel/nlohmann-json
 LIB_DEPENDS=	libc4core.so:devel/c4core \
 		libryml.so:devel/rapidyaml
 
-USES=		compiler:c++11-lib cmake localbase:ldflags
+USES=		compiler:c++17-lang cmake localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_JSONNET BUILD_JSONNETFMT BUILD_STATIC_LIBS \
 		BUILD_SHARED_BINARIES USE_SYSTEM_JSON
 CMAKE_OFF=	BUILD_TESTS
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/jsonnet/distinfo b/devel/jsonnet/distinfo
index 6b336c0ba352..77f96212e93b 100644
--- a/devel/jsonnet/distinfo
+++ b/devel/jsonnet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641409936
-SHA256 (google-jsonnet-v0.18.0_GH0.tar.gz) = 85c240c4740f0c788c4d49f9c9c0942f5a2d1c2ae58b2c71068107bc80a3ced4
-SIZE (google-jsonnet-v0.18.0_GH0.tar.gz) = 22472162
+TIMESTAMP = 1696949293
+SHA256 (google-jsonnet-v0.20.0_GH0.tar.gz) = 77bd269073807731f6b11ff8d7c03e9065aafb8e4d038935deb388325e52511b
+SIZE (google-jsonnet-v0.20.0_GH0.tar.gz) = 22481277
diff --git a/devel/jsonnet/files/patch-core_vm.cpp b/devel/jsonnet/files/patch-core_vm.cpp
index 29f1ae59a6d1..484824c11a9b 100644
--- a/devel/jsonnet/files/patch-core_vm.cpp
+++ b/devel/jsonnet/files/patch-core_vm.cpp
@@ -1,11 +1,22 @@
---- core/vm.cpp.orig	2021-12-21 17:55:49 UTC
+--- core/vm.cpp.orig	2023-04-17 19:02:16 UTC
 +++ core/vm.cpp
 @@ -23,7 +23,7 @@ limitations under the License.
  
  #include "desugarer.h"
  #include "json.h"
 -#include "json.hpp"
 +#include "nlohmann/json.hpp"
  #include "md5.h"
  #include "parser.h"
  #include "ryml_std.hpp" // include this before any other ryml header
+@@ -1710,6 +1710,10 @@ class Interpreter {
+             } break;
+ 
+             case json::value_t::discarded: {
++                abort();
++            }
++
++            case json::value_t::binary: {
+                 abort();
+             }
+         }