diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index d2a07bd00594..31b531fb6ac4 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -1,51 +1,50 @@
 PORTNAME=	librecad
-DISTVERSION=	2.2.0-rc2
-PORTREVISION=	1
+DISTVERSION=	2.2.0-rc3
 CATEGORIES=	cad
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	8c3b652a8813.patch:-p1 # https://github.com/LibreCAD/LibreCAD/issues/1488
+
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	2D CAD system
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/licenses/gpl-2.0.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/version.hpp:devel/boost-libs
 LIB_DEPENDS=	libmuparser.so:math/muparser \
 		libfreetype.so:print/freetype2
 
 USES=		compiler:c++11-lib cpe desktop-file-utils pkgconfig gl qmake qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	LibreCAD
 GH_PROJECT=	LibreCAD
 USE_GL=		gl
 USE_QT=		core gui printsupport svg widgets \
 		buildtools_build linguisttools_build
 
 QMAKE_ARGS+=	BOOST_DIR="${LOCALBASE}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|QMAKE_CXXFLAGS += -g||' \
 		${WRKSRC}/common.pri
 	@${REINPLACE_CMD} -e 's|lrelease|${LRELEASE}|' \
 		${WRKSRC}/scripts/postprocess-unix.sh
-	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
-		${WRKSRC}/librecad/src/lib/engine/rs_settings.cpp \
-		${WRKSRC}/librecad/src/lib/engine/rs_system.cpp
 
 pre-install:
 	@${CHMOD} +w ${WRKSRC}/unix/resources/plugins/*.so
 	@${STRIP_CMD} ${WRKSRC}/unix/resources/plugins/*.so
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unix/librecad ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/unix/ttf2lff ${STAGEDIR}${PREFIX}/bin
 	(cd ${WRKSRC}/unix/resources && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo
 	${INSTALL_DATA} ${WRKSRC}/unix/appdata/librecad.appdata.xml \
 		${STAGEDIR}${PREFIX}/share/metainfo
 	${INSTALL_DATA} ${WRKSRC}/desktop/librecad.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/librecad/res/main/librecad.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/cad/librecad/distinfo b/cad/librecad/distinfo
index 9afcfcd00b82..f57f8eb9a1f4 100644
--- a/cad/librecad/distinfo
+++ b/cad/librecad/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1611031013
-SHA256 (LibreCAD-LibreCAD-2.2.0-rc2_GH0.tar.gz) = d576abc6cd96ee8fbdd4ebd1c286a2ee5fedf9d08367fc261c5ad8393bfcee28
-SIZE (LibreCAD-LibreCAD-2.2.0-rc2_GH0.tar.gz) = 13561381
+TIMESTAMP = 1645761355
+SHA256 (LibreCAD-LibreCAD-2.2.0-rc3_GH0.tar.gz) = 0c279e3f688c2e7e11c2268bae3aee3422370a318264d0a7a21d31742ea46257
+SIZE (LibreCAD-LibreCAD-2.2.0-rc3_GH0.tar.gz) = 13563099
+SHA256 (8c3b652a8813.patch) = beca67a1325ea46ff36438fdc3efe957b477b49204adf9c7c01b3f8683a6e88e
+SIZE (8c3b652a8813.patch) = 11690