diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile
index f071e8960985..e9b571eba936 100644
--- a/lang/solidity/Makefile
+++ b/lang/solidity/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	solidity
-PORTVERSION=	0.8.16
+PORTVERSION=	0.8.17
 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
 WWW=		https://github.com/ethereum/solidity
 
 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
+OPTIONS_EXCLUDE_i386=	Z3
 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 1d03dd7fd566..33967dffbf87 100644
--- a/lang/solidity/distinfo
+++ b/lang/solidity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660400500
-SHA256 (solidity_0.8.16.tar.gz) = ba1a690a3583f17c039e6d480970f687f959d9c0fcb2e77ac72a0a0c7efa2056
-SIZE (solidity_0.8.16.tar.gz) = 3261000
+TIMESTAMP = 1662704814
+SHA256 (solidity_0.8.17.tar.gz) = b0337ab0125be7e54461ab76b6e483f5e912d3f3e4b0c89bd00cfb0a3d6a5afd
+SIZE (solidity_0.8.17.tar.gz) = 3119267