diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile
index 8ec9a3f997ba..4a2b8337020f 100644
--- a/lang/solidity/Makefile
+++ b/lang/solidity/Makefile
@@ -1,48 +1,48 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 
 PORTNAME=	solidity
-PORTVERSION=	0.8.12
+PORTVERSION=	0.8.13
 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 d07e4f4f2452..557825a2ffad 100644
--- a/lang/solidity/distinfo
+++ b/lang/solidity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645092631
-SHA256 (solidity_0.8.12.tar.gz) = c63c2caf64feaef9fbde7c8d26e3d15aa9b159d08e7213e1e6bd3e4fd06c8308
-SIZE (solidity_0.8.12.tar.gz) = 3147863
+TIMESTAMP = 1648132604
+SHA256 (solidity_0.8.13.tar.gz) = 474c76b30f6de12e1d84171d094a110f4a9dbee8e110313de430e7ebabccb3da
+SIZE (solidity_0.8.13.tar.gz) = 3183155
diff --git a/lang/solidity/files/patch-libevmasm_Assembly.cpp b/lang/solidity/files/patch-libevmasm_Assembly.cpp
new file mode 100644
index 000000000000..41034a4cceaa
--- /dev/null
+++ b/lang/solidity/files/patch-libevmasm_Assembly.cpp
@@ -0,0 +1,11 @@
+--- libevmasm/Assembly.cpp.orig	2022-03-24 17:16:26 UTC
++++ libevmasm/Assembly.cpp
+@@ -48,6 +48,8 @@ using namespace solidity::evmasm;
+ using namespace solidity::langutil;
+ using namespace solidity::util;
+ 
++#undef MSIZE // remove MSIZE definition from <sys/params.h>, included by boost 1.66.0
++
+ AssemblyItem const& Assembly::append(AssemblyItem _i)
+ {
+ 	assertThrow(m_deposit >= 0, AssemblyException, "Stack underflow.");
diff --git a/lang/solidity/files/patch-libevmasm_Instruction.h b/lang/solidity/files/patch-libevmasm_Instruction.h
index ddefe0e6d4cf..3b8c13e7d7e6 100644
--- a/lang/solidity/files/patch-libevmasm_Instruction.h
+++ b/lang/solidity/files/patch-libevmasm_Instruction.h
@@ -1,11 +1,11 @@
---- libevmasm/Instruction.h.orig	2020-12-16 17:41:40 UTC
+--- libevmasm/Instruction.h.orig	2022-03-16 14:18:52 UTC
 +++ libevmasm/Instruction.h
-@@ -27,6 +27,8 @@
+@@ -26,6 +26,8 @@
+ #include <libsolutil/Common.h>
  #include <libsolutil/Assertions.h>
- #include <functional>
  
 +#undef MSIZE // remove MSIZE definition from <sys/params.h>, included by boost 1.66.0
 +
  namespace solidity::evmasm
  {
  
diff --git a/lang/solidity/files/patch-libevmasm_SemanticInformation.cpp b/lang/solidity/files/patch-libevmasm_SemanticInformation.cpp
new file mode 100644
index 000000000000..1d7ec7ac648c
--- /dev/null
+++ b/lang/solidity/files/patch-libevmasm_SemanticInformation.cpp
@@ -0,0 +1,11 @@
+--- libevmasm/SemanticInformation.cpp.orig	2022-03-24 17:18:03 UTC
++++ libevmasm/SemanticInformation.cpp
+@@ -29,6 +29,8 @@ using namespace std;
+ using namespace solidity;
+ using namespace solidity::evmasm;
+ 
++#undef MSIZE // remove MSIZE definition from <sys/params.h>, included by boost 1.66.0
++
+ vector<SemanticInformation::Operation> SemanticInformation::readWriteOperations(Instruction _instruction)
+ {
+ 	switch (_instruction)
diff --git a/lang/solidity/files/patch-libevmasm_SimplificationRule.h b/lang/solidity/files/patch-libevmasm_SimplificationRule.h
new file mode 100644
index 000000000000..df9e65db7012
--- /dev/null
+++ b/lang/solidity/files/patch-libevmasm_SimplificationRule.h
@@ -0,0 +1,11 @@
+--- libevmasm/SimplificationRule.h.orig	2022-03-24 17:18:35 UTC
++++ libevmasm/SimplificationRule.h
+@@ -25,6 +25,8 @@
+ #include <libsolutil/CommonData.h>
+ #include <functional>
+ 
++#undef MSIZE // remove MSIZE definition from <sys/params.h>, included by boost 1.66.0
++
+ namespace solidity::evmasm
+ {
+