diff --git a/databases/heidisql/Makefile b/databases/heidisql/Makefile
index 6ee8cdc15199..ec3851e08d1f 100644
--- a/databases/heidisql/Makefile
+++ b/databases/heidisql/Makefile
@@ -1,50 +1,49 @@
 PORTNAME=	heidisql
-DISTVERSION=	12.15.1.1
+DISTVERSION=	12.16
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 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 a2f68805e3a0..800e00b5d496 100644
--- a/databases/heidisql/distinfo
+++ b/databases/heidisql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1769840162
-SHA256 (HeidiSQL-HeidiSQL-v12.15.1.1_GH0.tar.gz) = a231ae7c0f441845b41fe59acb36211dadf337b4b4fa69efd9d2284800388c3b
-SIZE (HeidiSQL-HeidiSQL-v12.15.1.1_GH0.tar.gz) = 31758195
+TIMESTAMP = 1773707038
+SHA256 (HeidiSQL-HeidiSQL-v12.16_GH0.tar.gz) = 02ce3792ddbe2efaecaed0214fbf584d3d28a20e1996127cc17a21cf02989465
+SIZE (HeidiSQL-HeidiSQL-v12.16_GH0.tar.gz) = 31887027
diff --git a/databases/heidisql/files/patch-source_preferences.pas b/databases/heidisql/files/patch-source_preferences.pas
index adc7bf97bf16..1b34380d111f 100644
--- a/databases/heidisql/files/patch-source_preferences.pas
+++ b/databases/heidisql/files/patch-source_preferences.pas
@@ -1,78 +1,77 @@
---- source/preferences.pas.orig	2026-01-30 17:33:07 UTC
+--- source/preferences.pas.orig	2026-03-10 16:34:29 UTC
 +++ source/preferences.pas
 @@ -15,7 +15,11 @@ uses
    SynEdit, laz.VirtualTrees, SynEditKeyCmds, ActnList, Menus,
-   dbstructures, RegExpr, EditBtn, LCLType, StrUtils,
+   dbstructures, RegExpr, EditBtn, LCLType, StrUtils, SpinEx,
    extra_controls, reformatter, Buttons, ColorBox, LCLProc, LCLIntf, lazaruscompat, FileUtil,
 -  vktable, generic_types;
 +  vktable, generic_types
 +{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
 +  , LazEditTextAttributes
 +{$ENDIF}
 +  ;
  
  type
    TShortcutItemData = record
 @@ -554,7 +558,11 @@ begin
      ')';
    SynSQLSynSQLSample.TableNames.CommaText := 'tableA,tableB';
    for i:=0 to SynSQLSynSQLSample.AttrCount - 1 do begin
 +{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
 +    SynSQLSynSQLSample.Attribute[i].Assign(FAppColorScheme.SynSqlSyn.Attribute[i]);
 +{$ELSE}
      SynSQLSynSQLSample.Attribute[i].AssignColorAndStyle(FAppColorScheme.SynSqlSyn.Attribute[i]);
 +{$ENDIF}
      comboSQLColElement.Items.Add(SynSQLSynSQLSample.Attribute[i].Name);
    end;
    comboSQLColElement.Items.Add(_('Active line background'));
 @@ -748,7 +756,11 @@ var
  procedure TfrmPreferences.SQLFontChange(Sender: TObject);
  var
    AttriIdx: Integer;
--  Attri: TSynHighlighterAttributes;
 +{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
 +  Attri: TLazEditTextAttribute;
 +{$ELSE}
-+   Attri: TSynHighlighterAttributes;
+   Attri: TSynHighlighterAttributes;
 +{$ENDIF}
    Foreground, Background: TColor;
+   FontStyle: Integer;
  begin
-   if comboSQLFontName.ItemIndex > -1 then
-@@ -890,8 +902,13 @@ begin
+@@ -894,8 +906,13 @@ begin
    // Color preset selected
    ColorScheme := AppColorSchemes[comboEditorColorsPreset.ItemIndex];
    for j:=0 to SynSQLSynSQLSample.AttrCount - 1 do begin
 +{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
 +    SynSQLSynSQLSample.Attribute[j].Assign(ColorScheme.SynSqlSyn.Attribute[j]);
 +    FAppColorScheme.SynSqlSyn.Attribute[j].Assign(ColorScheme.SynSqlSyn.Attribute[j]);
 +{$ELSE}
      SynSQLSynSQLSample.Attribute[j].AssignColorAndStyle(ColorScheme.SynSqlSyn.Attribute[j]);
      FAppColorScheme.SynSqlSyn.Attribute[j].AssignColorAndStyle(ColorScheme.SynSqlSyn.Attribute[j]);
 +{$ENDIF}
    end;
    SynMemoSQLSample.LineHighlightColor.Background := ColorScheme.ActiveLineBackground;
    SynMemoSQLSample.BracketMatchColor.Foreground := ColorScheme.MatchingBraceForeground;
-@@ -952,7 +969,11 @@ var
+@@ -956,7 +973,11 @@ var
  procedure TfrmPreferences.comboSQLColElementChange(Sender: TObject);
  var
    AttriIdx: Integer;
 +{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
 +  Attri: TLazEditTextAttribute;
 +{$ELSE}
    Attri: TSynHighlighterAttributes;
 +{$ENDIF}
    Foreground, Background: TColor;
  begin
    AttriIdx := comboSQLColElement.ItemIndex;
-@@ -997,7 +1018,11 @@ var
+@@ -1001,7 +1022,11 @@ var
  procedure TfrmPreferences.SynMemoSQLSampleClick(Sender: TObject);
  var
    Token: String;
 +{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
 +  Attri: TLazEditTextAttribute;
 +{$ELSE}
    Attri: TSynHighlighterAttributes;
 +{$ENDIF}
    AttriIdx: Integer;
    sm: TSynEdit;
  begin