diff --git a/emulators/libretro-kronos/Makefile b/emulators/libretro-kronos/Makefile
index a11909bc30bc..84e3b40e5703 100644
--- a/emulators/libretro-kronos/Makefile
+++ b/emulators/libretro-kronos/Makefile
@@ -1,58 +1,68 @@
 PORTNAME=	libretro-kronos
-PORTVERSION=	0.20210617
+PORTVERSION=	2.1.5.20210601
 CATEGORIES=	emulators games
 
 MAINTAINER=	beyert@cs.ucr.edu
 COMMENT=	Sega Saturn and ST-V emulator forked from uoYabause for libretro
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/yabause/COPYING
 
 LIB_DEPENDS=	libGL.so:graphics/mesa-libs
 
 # standalone version uses solely cmake, whereas the retroarch core uses both
 # cmake and gmake
 USES=		cmake:noninja compiler:c++11-lib gl gmake pkgconfig qt:5 sdl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FCare
 GH_PROJECT=	Kronos
 GH_TAGNAME=	a39f95a
 
 USE_GL=	gl glew glu
 
 USE_LDCONFIG=	yes
 
 USE_QT=	core opengl buildtools_build qmake_build
 
 USE_SDL=	sdl2
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/yabause
 
 MAKE_ARGS=	USE_RTHREADS=1
 
 CFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	lib/libretro/kronos_libretro.so
 
 pre-build:
 	cd ${CMAKE_SOURCE_PATH} && ${CMAKE_BIN} .
 	cd ${WRKSRC}/yabause/src && ${MAKE} m68kmake
 
 .include <bsd.port.pre.mk>
 
+.if ${CHOSEN_COMPILER_TYPE} == clang
+# clang13 runs out of memory
+LLVM_VER=	12
+BUILD_DEPENDS+=	clang++${LLVM_VER}:devel/llvm${LLVM_VER}
+CC=	${LOCALBASE}/bin/clang${LLVM_VER}
+CXX=	${LOCALBASE}/bin/clang++${LLVM_VER}
+.endif
+
 do-build:
 	cd ${WRKSRC}/yabause/src/libretro && ${DO_MAKE_BUILD}
 
 post-patch:
 .if ${ARCH} != "amd64"
-	@${REINPLACE_CMD} -e "s/HAVE_SSE = 1/HAVE_SSE = 0/" ${WRKSRC}/yabause/src/libretro/Makefile
+	@${REINPLACE_CMD} -e "s/HAVE_SSE = 1/HAVE_SSE = 0/" \
+		${WRKSRC}/yabause/src/libretro/Makefile
 .endif
 
 do-install:
-	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
-	${INSTALL_LIB} ${WRKSRC}/yabause/src/libretro/kronos_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
+	@${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
+	${INSTALL_LIB} ${WRKSRC}/yabause/src/libretro/kronos_libretro.so \
+		${STAGEDIR}/${PREFIX}/lib/libretro;
 
 .include <bsd.port.post.mk>
diff --git a/emulators/libretro-kronos/distinfo b/emulators/libretro-kronos/distinfo
index 0fd66c7ae29f..0f281f180b18 100644
--- a/emulators/libretro-kronos/distinfo
+++ b/emulators/libretro-kronos/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623926653
-SHA256 (FCare-Kronos-0.20210617-a39f95a_GH0.tar.gz) = a9edd4b88b874f4b1d1fb0b9e66cf2bc8bc3b643ee02b127db84a79fce31a6e8
-SIZE (FCare-Kronos-0.20210617-a39f95a_GH0.tar.gz) = 36104449
+TIMESTAMP = 1656726449
+SHA256 (FCare-Kronos-2.1.5.20210601-a39f95a_GH0.tar.gz) = a9edd4b88b874f4b1d1fb0b9e66cf2bc8bc3b643ee02b127db84a79fce31a6e8
+SIZE (FCare-Kronos-2.1.5.20210601-a39f95a_GH0.tar.gz) = 36104449