diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile
index e15125eef8e8..73ca62546bef 100644
--- a/lang/solidity/Makefile
+++ b/lang/solidity/Makefile
@@ -1,47 +1,46 @@
 PORTNAME=	solidity
-PORTVERSION=	0.8.15
-PORTREVISION=	1
+PORTVERSION=	0.8.16
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/ethereum/solidity/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Solidity Contract-Oriented Programming Language
 
 LICENSE=	GPLv3
 
 NOT_FOR_ARCHS=		powerpc powerpc64 powerpcspe sparc64
 NOT_FOR_ARCHS_REASON=	solidity currently does not support big endian systems
 
 BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs \
 		libfmt>=0:devel/libfmt \
 		range-v3>=0:devel/range-v3
 LIB_DEPENDS=	libjsoncpp.so:devel/jsoncpp
 
 USES=		cmake compiler:c++14-lang cpe
 CPE_VENDOR=	${PORTNAME}lang
 
 OPTIONS_DEFINE=	Z3 CVC4
 OPTIONS_DEFAULT=Z3 CVC4
 Z3_DESC=	SMT Checker via Z3
 CVC4_DESC=	SMT Checker via CVC4
 Z3_LIB_DEPENDS=		libz3.so:math/z3
 CVC4_LIB_DEPENDS=	libcvc4.so:math/cvc4 libgmp.so:math/gmp
 Z3_CMAKE_OFF=	USE_Z3
 CVC4_CMAKE_OFF=	USE_CVC4
 
 CMAKE_ARGS+=	-DUSE_LD_GOLD=OFF -DTESTS=OFF \
 		-DRANGE_V3_INCLUDE_DIR="${LOCALBASE}/include" \
 		-DJSONCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/jsoncpp" \
 		-DJSONCPP_LIB_DIR:STRING="${LOCALBASE}/lib" \
 		-DSTRICT_Z3_VERSION=OFF
 
 PLIST_FILES=	bin/solc \
 		bin/solidity-upgrade \
 		bin/yul-phaser
 
 pre-patch:
 		@${CP} ${FILESDIR}/fmtlib.cmake ${FILESDIR}/jsoncpp.cmake ${WRKSRC}/cmake/
 		@${REINPLACE_CMD} '/EthCcache/d' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/lang/solidity/distinfo b/lang/solidity/distinfo
index cca122eaae75..1d03dd7fd566 100644
--- a/lang/solidity/distinfo
+++ b/lang/solidity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1655706800
-SHA256 (solidity_0.8.15.tar.gz) = 5720a50b3fa463afb90bf22c3cf5d2d8541b3a689bdb057da259fde88a472a49
-SIZE (solidity_0.8.15.tar.gz) = 3083247
+TIMESTAMP = 1660400500
+SHA256 (solidity_0.8.16.tar.gz) = ba1a690a3583f17c039e6d480970f687f959d9c0fcb2e77ac72a0a0c7efa2056
+SIZE (solidity_0.8.16.tar.gz) = 3261000
diff --git a/lang/solidity/files/patch-cmake_range-v3.cmake b/lang/solidity/files/patch-cmake_range-v3.cmake
index 84fc7ebb676c..ea5bff8c52bd 100644
--- a/lang/solidity/files/patch-cmake_range-v3.cmake
+++ b/lang/solidity/files/patch-cmake_range-v3.cmake
@@ -1,39 +1,39 @@
 --- cmake/range-v3.cmake.orig	2021-01-28 15:15:15 UTC
 +++ cmake/range-v3.cmake
 @@ -1,36 +1,11 @@
 -include(ExternalProject)
 -
  if (${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
      set(RANGE_V3_CMAKE_COMMAND emcmake cmake)
  else()
      set(RANGE_V3_CMAKE_COMMAND ${CMAKE_COMMAND})
  endif()
  
 -set(prefix "${CMAKE_BINARY_DIR}/deps")
 -set(RANGE_V3_INCLUDE_DIR "${prefix}/include")
 -
 -ExternalProject_Add(range-v3-project
 -    PREFIX "${prefix}"
 -    DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/downloads"
--    DOWNLOAD_NAME range-v3-0.11.0.tar.gz
--    URL https://github.com/ericniebler/range-v3/archive/0.11.0.tar.gz
--    URL_HASH SHA256=376376615dbba43d3bef75aa590931431ecb49eb36d07bb726a19f680c75e20c
+-    DOWNLOAD_NAME range-v3-0.12.0.tar.gz
+-    URL https://github.com/ericniebler/range-v3/archive/0.12.0.tar.gz
+-    URL_HASH SHA256=015adb2300a98edfceaf0725beec3337f542af4915cec4d0b89fa0886f4ba9cb
 -    CMAKE_COMMAND ${RANGE_V3_CMAKE_COMMAND}
 -    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
 -               -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
 -               -DBUILD_TESTING=OFF
 -               -DRANGES_CXX_STD=${CMAKE_CXX_STANDARD}
 -               -DRANGE_V3_DOCS=OFF
 -               -DRANGE_V3_EXAMPLES=OFF
 -               -DRANGE_V3_TESTS=OFF
 -               -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
 -               -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 -    BUILD_BYPRODUCTS "${RANGE_V3_INCLUDE_DIR}/range/v3/all.hpp"
 -)
 -
  # Create range-v3 imported library
  add_library(range-v3 INTERFACE IMPORTED)
 -file(MAKE_DIRECTORY ${RANGE_V3_INCLUDE_DIR})  # Must exist.
  set_target_properties(range-v3 PROPERTIES
      INTERFACE_COMPILE_OPTIONS "\$<\$<CXX_COMPILER_ID:MSVC>:/permissive->"
      INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${RANGE_V3_INCLUDE_DIR}