diff --git a/databases/heidisql/Makefile b/databases/heidisql/Makefile
index ad70944739be..ca5c766ba2b4 100644
--- a/databases/heidisql/Makefile
+++ b/databases/heidisql/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	heidisql
-DISTVERSION=	12.17
+DISTVERSION=	12.18
+DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	a lightweight client for managing multiple databases
 WWW=		https://www.heidisql.com/
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 USES=		desktop-file-utils fpc lazarus:flavors xorg
 USE_XORG=	x11
 USE_GITHUB=	yes
 GH_ACCOUNT=	HeidiSQL
 GH_PROJECT=	HeidiSQL
 
 LAZARUS_PROJECT_FILES+=	heidisql.lpi
 
 LAZBUILD_ARGS=		-d
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5 ${PORTNAME}-qt6
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt6
 qt6_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt5
 
 USE_FPC_gtk2=	cairo
 USE_GNOME_gtk2=	cairo
 USE_FPC+=	${USE_FPC_${FLAVOR}}
 USE_GNOME+=	${USE_GNOME_${FLAVOR}}
 
 SUB_FILES=	pkg-message
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/source/apphelpers.pas \
 		${WRKSRC}/source/about.pas
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/package-skeleton/usr/share/applications/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps
 	${INSTALL_DATA} ${WRKSRC}/res/deb-package-icon.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/${PORTNAME}.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}/locale
 	${INSTALL_DATA} ${WRKSRC}/extra/ini/*.ini ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/extra/locale/*.mo ${STAGEDIR}${DATADIR}/locale/
 
 .include <bsd.port.mk>
diff --git a/databases/heidisql/distinfo b/databases/heidisql/distinfo
index cbb325fa783f..f4fe018d963a 100644
--- a/databases/heidisql/distinfo
+++ b/databases/heidisql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1776628035
-SHA256 (HeidiSQL-HeidiSQL-12.17_GH0.tar.gz) = 367ed5ea308ad30ae2303b0c19614e242788a8e5e30b3471c21f1f00d54a09ad
-SIZE (HeidiSQL-HeidiSQL-12.17_GH0.tar.gz) = 31894060
+TIMESTAMP = 1781145991
+SHA256 (HeidiSQL-HeidiSQL-v12.18_GH0.tar.gz) = c20aaf80b2d7927c978ed8f84ab0c69678333d4d5b7ae0920fb71665392dc811
+SIZE (HeidiSQL-HeidiSQL-v12.18_GH0.tar.gz) = 32124132
diff --git a/databases/heidisql/files/patch-source_main.pas b/databases/heidisql/files/patch-source_main.pas
index 5025fddeb390..e91d318b781d 100644
--- a/databases/heidisql/files/patch-source_main.pas
+++ b/databases/heidisql/files/patch-source_main.pas
@@ -1,53 +1,53 @@
---- source/main.pas.orig	2026-01-30 17:33:07 UTC
+--- source/main.pas.orig	2026-06-09 17:25:49 UTC
 +++ source/main.pas
 @@ -15,9 +15,12 @@ uses
    LazStringUtils, dbconnection, dbstructures, dbstructures.mysql, generic_types,
    apphelpers, extra_controls, createdatabase, SynEditMarkup, SynEditMarkupBracket,
    searchreplace, ImgList, IniFiles, LazFileUtils, LazUTF8, tabletools,
--  lazaruscompat, extfiledialog, process, SynEditMiscClasses, Contnrs;
-+  lazaruscompat, extfiledialog, process, SynEditMiscClasses, Contnrs
+-  lazaruscompat, extfiledialog, process, SynEditMiscClasses, Contnrs, SynExportHTML;
++  lazaruscompat, extfiledialog, process, SynEditMiscClasses, Contnrs, SynExportHTML
 +{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
 +  , LazEditTextAttributes
 +{$ENDIF}
 +  ;
  
 -
  type
  
    // Bind parameters for query tabs
-@@ -7062,7 +7065,11 @@ var
+@@ -7129,7 +7132,11 @@ var
    Editor: TSynMemo;
    Token: String;
    CaretStart, CaretTokenTypeInt: Integer;
 +{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
 +  Attri: TLazEditTextAttribute;
 +{$ELSE}
    Attri: TSynHighlighterAttributes;
 +{$ENDIF}
    Proposal: TSynCompletion;
    p: TPoint;
    LineIdx, ColIdx, StartCol, EndCol: Integer;
-@@ -7278,7 +7285,11 @@ var
+@@ -7345,7 +7352,11 @@ var
  var
    Edit: TSynEdit;
    Token: String;
 +{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
 +  Attri: TLazEditTextAttribute;
 +{$ELSE}
    Attri: TSynHighlighterAttributes;
 +{$ENDIF}
    TokenType, TokenStart: Integer;
    RowColPos: TPoint;
    SQLFunc: TSQLFunction;
-@@ -13182,7 +13193,11 @@ var
+@@ -13403,7 +13414,11 @@ var
    Editors: TComponentList;
    BaseEditor: TSynMemo;
    KeyStroke: TSynEditKeyStroke;
 +{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
 +  Attri: TLazEditTextAttribute;
 +{$ELSE}
    Attri: TSynHighlighterAttributes;
 +{$ENDIF}
    Shortcut1, Shortcut2: TShortcut;
  begin
    // Setup all known TSynMemo's