diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile
index a53e7676869b..a34b27306990 100644
--- a/lang/solidity/Makefile
+++ b/lang/solidity/Makefile
@@ -1,50 +1,51 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 
 PORTNAME=	solidity
 PORTVERSION=	0.8.14
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/ethereum/solidity/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
+PATCH_SITES=	https://github.com/ethereum/solidity/commit/
+PATCHFILES=	026e26af998c10ca4e39ab6b1b8e64dbc2fdd910.patch:-p1 # https://github.com/ethereum/solidity/pull/13090
+
 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
 
-BROKEN=		error: implicit conversion loses integer precision: 'typename std::enable_if<number_category<cpp_int_backend<0, 0, boost::multiprecision::signed_magnitude, boost::multiprecision::unchecked, allocator<unsigned long long>>>::value == number_kind_integer, std::size_t>::type' (aka 'unsigned long') to 'unsigned int'
-
 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 64d2bfcc474e..a2d79b177fe1 100644
--- a/lang/solidity/distinfo
+++ b/lang/solidity/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1652802997
+TIMESTAMP = 1654144304
 SHA256 (solidity_0.8.14.tar.gz) = 7ccdf20c889206103d0a48fe10b1c3f1f21269070861e80382f7ede8785e61d4
 SIZE (solidity_0.8.14.tar.gz) = 3214611
+SHA256 (026e26af998c10ca4e39ab6b1b8e64dbc2fdd910.patch) = fe2ecb05f607e19cd6795c135e046a0414b32d6b12eee745c5a5d05fe38ce7c9
+SIZE (026e26af998c10ca4e39ab6b1b8e64dbc2fdd910.patch) = 2189
diff --git a/lang/solidity/files/patch-tools_solidityUpgrade_SourceUpgrade.cpp b/lang/solidity/files/patch-tools_solidityUpgrade_SourceUpgrade.cpp
new file mode 100644
index 000000000000..59e040bce985
--- /dev/null
+++ b/lang/solidity/files/patch-tools_solidityUpgrade_SourceUpgrade.cpp
@@ -0,0 +1,13 @@
+- workaround for https://github.com/ethereum/solidity/issues/13091
+
+--- tools/solidityUpgrade/SourceUpgrade.cpp.orig	2022-06-02 02:23:26 UTC
++++ tools/solidityUpgrade/SourceUpgrade.cpp
+@@ -34,6 +34,8 @@
+ 	#include <unistd.h>
+ #endif
+ 
++#include <fstream>
++
+ 
+ namespace po = boost::program_options;
+ namespace fs = boost::filesystem;