diff --git a/editors/picpas/Makefile b/editors/picpas/Makefile
index fd0bcbe2f9d5..c59aee1d3bcd 100644
--- a/editors/picpas/Makefile
+++ b/editors/picpas/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	picpas
 PORTVERSION=	0.9.0
 PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Multi-platform Pascal for Microchip PIC16F microcontrollers
 
 LICENSE=	GPLv2
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 USES=		dos2unix fpc gnome lazarus:flavors xorg
 USE_FPC=	chm fcl-base fcl-image fcl-json fcl-registry fcl-xml pasjpeg regexpr \
 		rtl-objpas x11
 USE_XORG=	x11
 DOS2UNIX_REGEX=	.*\.([txt]|pas|lpi|txt|lfm)
 USE_GITHUB=	yes
 GH_ACCOUNT=	t-edson
 GH_PROJECT=	PicPas
 GH_TAGNAME=	7940bc3
 GH_TUPLE=	t-edson:MiConfig:a4a988a:miconfig/miconfig \
 		t-edson:MisUtils:742eff3:misutils/misutils  \
 		t-edson:PicUtils:5f89bdf:picutils/picutils \
 		t-edson:SynFacilUtils:8725237:syncfacilutils/syncfacilutils \
 		t-edson:UtilsGrilla:07744b9:utilsgrilla/utilsgrilla \
 		t-edson:ogEditGraf:a19b68a:ogeditgraf/ogeeditgraf \
 		t-edson:t-Xpres:6665922:txpres/txpres
 
 USE_FPC_gtk2=	cairo
 USE_GNOME_gtk2=	cairo
 USE_FPC+=	${USE_FPC_${FLAVOR}}
 USE_GNOME+=	${USE_GNOME_${FLAVOR}}
 
 LAZARUS_PROJECT_FILES=	Source/PicPas.lpi
 LAZBUILD_ARGS=		-d
 
 post-patch:
 	${REINPLACE_CMD} 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/Source/Globales.pas
 	${REINPLACE_CMD} 's|0.8.7|${PORTVERSION}|g' ${WRKSRC}/version.txt
+	${REINPLACE_CMD} '81d' ${WRKSRC}/Source/FrameSyntaxTree.lfm
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/PicPas-freebsd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "devices10 devices16 devices17 syntax samples temp themes units" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/editors/picpas/files/patch-Source_FrameCfgSynEdit.pas b/editors/picpas/files/patch-Source_FrameCfgSynEdit.pas
new file mode 100644
index 000000000000..fdfa911cde8a
--- /dev/null
+++ b/editors/picpas/files/patch-Source_FrameCfgSynEdit.pas
@@ -0,0 +1,12 @@
+--- Source/FrameCfgSynEdit.pas	2022-02-09 20:05:08.675326000 -0500
++++ Source/FrameCfgSynEdit.pas	2022-02-09 20:05:30.737942000 -0500
+@@ -9,7 +9,8 @@
+ interface
+ uses
+   Classes, SysUtils, Forms, StdCtrls, Dialogs, SynEdit, Graphics,
+-  Globales, MiConfigXML, MiConfigBasic, SynEditMarkupHighAll, SynEditMarkup;
++  Globales, MiConfigXML, MiConfigBasic, SynEditMarkupHighAll, SynEditMarkup,
++  SynEditTypes;
+ type
+ 
+   { TfraCfgSynEdit }