diff --git a/databases/heidisql/Makefile b/databases/heidisql/Makefile
index 74f024f7d6c5..e860e68c743d 100644
--- a/databases/heidisql/Makefile
+++ b/databases/heidisql/Makefile
@@ -1,53 +1,49 @@
 PORTNAME=	heidisql
-DISTVERSION=	12.14.1.1
+DISTVERSION=	12.15.1.1
 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
-GH_TAGNAME=	2967ad28b4e3172e302cb8d487c0d3a5c752b3f
 
 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|FPC_FULLVERSION<30204|FPC_FULLVERSION<30203|g' \
-		${WRKSRC}/source/main.pas ${WRKSRC}/source/usermanager.pas
-	${REINPLACE_CMD} -e 's|System.UITypes,||g' ${WRKSRC}/source/table_editor.pas \
-		${WRKSRC}/source/grideditlinks.pas
-	${REINPLACE_CMD} -e 's| \+ \[ofAllowMultiSelect\]||g' ${WRKSRC}/source/main.pas
-	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/source/apphelpers.pas
+	${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}
+	@${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 e8689ddf9710..a2f68805e3a0 100644
--- a/databases/heidisql/distinfo
+++ b/databases/heidisql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765951752
-SHA256 (HeidiSQL-HeidiSQL-v12.14.1.1-2967ad28b4e3172e302cb8d487c0d3a5c752b3f_GH0.tar.gz) = 9fbbf09f21220d3f96ea37f4d869dc18cd0f3a67073ca2a8b3539473cd9c79e6
-SIZE (HeidiSQL-HeidiSQL-v12.14.1.1-2967ad28b4e3172e302cb8d487c0d3a5c752b3f_GH0.tar.gz) = 27522595
+TIMESTAMP = 1769840162
+SHA256 (HeidiSQL-HeidiSQL-v12.15.1.1_GH0.tar.gz) = a231ae7c0f441845b41fe59acb36211dadf337b4b4fa69efd9d2284800388c3b
+SIZE (HeidiSQL-HeidiSQL-v12.15.1.1_GH0.tar.gz) = 31758195
diff --git a/databases/heidisql/files/patch-source_about.pas b/databases/heidisql/files/patch-source_about.pas
new file mode 100644
index 000000000000..faec7fe103ba
--- /dev/null
+++ b/databases/heidisql/files/patch-source_about.pas
@@ -0,0 +1,11 @@
+--- source/about.pas.orig	2026-01-30 17:33:07 UTC
++++ source/about.pas
+@@ -120,7 +120,7 @@ begin
+   Caption := f_('About %s', [APPNAME]);
+   lblAppName.Caption := APPNAME;
+   lblAppVersion.Caption := _('Version') + ' ' + Mainform.AppVersion;
+-  lblAppCompiled.Caption := _('Compiled on:') + ' ' + DateTimeToStr(GetFileModTime(Application.ExeName)) + ' with';
++  lblAppCompiled.Caption := _('Compiled on:') + ' ' + DateTimeToStr(GetFileModTime({$IFDEF FREEBSD}'/usr/local/bin/'+{$ENDIF}Application.ExeName)) + ' with';
+   lnklblCompiler.Caption := GetCompilerVersion;
+   lnklblCompiler.Hint := 'https://www.lazarus-ide.org/?utm_source='+APPNAME;
+   lnklblWebpage.Caption := APPDOMAIN;
diff --git a/databases/heidisql/files/patch-source_apphelpers.pas b/databases/heidisql/files/patch-source_apphelpers.pas
deleted file mode 100644
index 2d542650c371..000000000000
--- a/databases/heidisql/files/patch-source_apphelpers.pas
+++ /dev/null
@@ -1,63 +0,0 @@
---- source/apphelpers.pas	2025-12-16 11:00:34.000000000 -0800
-+++ source/apphelpers.pas	2025-12-17 00:09:19.625236000 -0800
-@@ -1316,16 +1316,21 @@
-   {$IFDEF LINUX}
-   Result := '';
-   {$ENDIF}
-+  {$IFDEF FREEBSD}
-+  Result := '';
-+  {$ENDIF}
- end;
- 
- function GetResourcesDir: String;
- begin
-+  Result := GetAppDir;
-   // point to resources dir in macOS app bundle
-   {$IFDEF DARWIN}
-   Result := GetAppDir + '..' + DirectorySeparator + 'Resources' + DirectorySeparator;
--  {$ELSE}
--  Result := GetAppDir;
-   {$ENDIF}
-+  {$IFDEF FREEBSD}
-+  Result := '%%DATADIR%%/';
-+  {$ENDIF}
- end;
- 
- {**
-@@ -2911,7 +2916,7 @@
-   Output: String;
-   CmdResult: Boolean;
- begin
--  {$IfDef LINUX}
-+  {$if defined(LINUX) or defined(FREEBSD)}
-   // Netcat on Linux
-   CmdResult := Process.RunCommandInDir('', 'nc', ['-w 1 -zv 127.0.0.1 '+Port.ToString], Output);
-   Result := not CmdResult;
-@@ -3026,7 +3031,7 @@
-     FreeLibrary(NTHandle);
-   end;
-   {$EndIf}
--  {$IfDef LINUX}
-+  {$if defined(LINUX) or defined(FREEBSD)}
-   IsWineStored := 0;
-   {$EndIf}
-   Result := IsWineStored = 1;
-@@ -3063,6 +3068,9 @@
- function GetOS: String;
- begin
-   Result := 'Unknown';
-+  {$IfDef FreeBSD}
-+  Result := 'FreeBSD';
-+  {$EndIf}
-   {$IfDef LINUX}
-   Result := 'Linux';
-   {$EndIf}
-@@ -4569,7 +4577,7 @@
-       1: begin // String
-         Value := StringReplace(Value, CHR13REPLACEMENT, #13, [rfReplaceAll]);
-         Value := StringReplace(Value, CHR10REPLACEMENT, #10, [rfReplaceAll]);
--        {$IfDef LINUX}
-+        {$if defined(LINUX) or defined(FREEBSD)}
-         Value := ConvertWindowsToLinuxPath(Value);
-         {$EndIf}
-         FRegistry.WriteString(Name, Value);
diff --git a/databases/heidisql/files/patch-source_customize__highlighter.pas b/databases/heidisql/files/patch-source_customize__highlighter.pas
new file mode 100644
index 000000000000..0eb15235ae68
--- /dev/null
+++ b/databases/heidisql/files/patch-source_customize__highlighter.pas
@@ -0,0 +1,27 @@
+--- source/customize_highlighter.pas.orig	2026-01-30 17:33:07 UTC
++++ source/customize_highlighter.pas
+@@ -7,7 +7,11 @@ uses
+ uses
+   SysUtils, Variants, Classes, Graphics, EditBtn,
+   Controls, Forms, Dialogs, StdCtrls, ExtCtrls,
+-  StrUtils, SynEditHighlighter, apphelpers, extra_controls;
++  StrUtils, SynEditHighlighter, apphelpers, extra_controls
++{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
++  , LazEditTextAttributes
++{$endif}
++;
+ 
+ type
+   TfrmCustomizeHighlighter = class(TExtForm)
+@@ -34,7 +38,11 @@ type
+   private
+     { Private-Deklarationen }
+     FHighlighter: TSynCustomHighlighter;
++{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
++    FAttr: TLazEditTextAttribute;
++{$ELSE}
+     FAttr: TSynHighlighterAttributes;
++{$ENDIF}
+     FOnChange: TNotifyEvent;
+     procedure SetFriendlyLanguageName(FriendlyLanguageName: String);
+     function GetFriendlyLanguageName: String;
diff --git a/databases/heidisql/files/patch-source_dbconnection.pas b/databases/heidisql/files/patch-source_dbconnection.pas
deleted file mode 100644
index bf2637ad4a58..000000000000
--- a/databases/heidisql/files/patch-source_dbconnection.pas
+++ /dev/null
@@ -1,127 +0,0 @@
---- source/dbconnection.pas	2025-12-16 22:09:54.829290000 -0800
-+++ source/dbconnection.pas	2025-12-16 22:11:26.512363000 -0800
-@@ -231,10 +231,10 @@
-   end;
-   TDatabaseCache = class(TObjectList<TDBObjectList>); // A list of db object lists, used for caching
-   TDBObjectComparer = class(TComparer<TDBObject>)
--    function Compare({$IF FPC_FULLVERSION<30204}constref{$ELSE}const{$ENDIF} Left, Right: TDBObject): Integer; override;
-+    function Compare({$IF FPC_FULLVERSION<30203}constref{$ELSE}const{$ENDIF} Left, Right: TDBObject): Integer; override;
-   end;
-   TDBObjectDropComparer = class(TComparer<TDBObject>)
--    function Compare({$IF FPC_FULLVERSION<30204}constref{$ELSE}const{$ENDIF} Left, Right: TDBObject): Integer; override;
-+    function Compare({$IF FPC_FULLVERSION<30203}constref{$ELSE}const{$ENDIF} Left, Right: TDBObject): Integer; override;
-   end;
- 
-   TOidStringPairs = TDictionary<POid, String>;
-@@ -1911,7 +1911,7 @@
-   {$If defined(WINDOWS) OR defined(DARWIN)}
-   DllPath, DllFile: String;
-   Dlls: TStringList;
--  {$ElseIf defined(LINUX)}
-+  {$ElseIf defined(LINUX) OR defined(FREEBSD)}
-   LibMapOutput, LibMap: String;
-   LibMapLines: TStringList;
-   {$EndIf}
-@@ -1926,9 +1926,11 @@
-     rx.ModifierI := True;
-     case NetTypeGroup of
-       ngMySQL:
--        {$IfDef LINUX}
-+        {$If defined(LINUX)}
-         // libmariadb.so.0 (libc,...) => /lib/x86_64-linux-gnu/libmariadb.so
-         rx.Expression := '^\s*lib(mysqlclient|mariadb|perconaserverclient)\.[^=]+=>\s*(\S+)$';
-+        {$ElseIf defined(FREEBSD)}
-+        rx.Expression := '(mysqlclient|mariadb|perconaserverclient)[^=]+=>\s*(\S+)$';
-         {$Else}
-         rx.Expression := '^lib(mysql|mariadb).*\.' + SharedSuffix;
-         {$EndIf}
-@@ -1939,14 +1941,18 @@
-         rx.Expression := '^(dblib|libsybdb).*\.' + SharedSuffix;
-         {$EndIf}
-       ngPgSQL:
--        {$IfDef LINUX}
-+        {$If defined(LINUX)}
-         rx.Expression := '^\s*(libpq)[^=]+=>\s*(\S+)$';
-+        {$ElseIf defined(FREEBSD)}
-+        rx.Expression := '(lpq)[^=]+=>\s*(\S+)$';
-         {$Else}
-         rx.Expression := '^libpq.*\.' + SharedSuffix;
-         {$EndIf}
-       ngSQLite: begin
--        {$IfDef LINUX}
-+        {$If defined(LINUX)}
-         rx.Expression := '^\s*(libsqlite3)[^=]+=>\s*(\S+)$';
-+        {$ElseIf defined(FREEBSD)}
-+        rx.Expression := '(lsqlite3)[^=]+=>\s*(\S+)$';
-         {$Else}
-         if NetType = ntSQLite then
-           rx.Expression := '^(lib)?sqlite.*\.' + SharedSuffix
-@@ -1959,9 +1965,13 @@
-     end;
-     case NetTypeGroup of
-       ngMySQL, ngMSSQL, ngPgSQL, ngSQLite, ngInterbase: begin
-+        {$if defined(LINUX) or defined(FREEBSD)}
-         {$IfDEF LINUX}
-         // See https://serverfault.com/a/513938
-         Process.RunCommandInDir('', '/sbin/ldconfig', ['-p'], LibMapOutput);
-+        {$Else}
-+        Process.RunCommandInDir('', '/sbin/ldconfig', ['-r'], LibMapOutput);
-+        {$EndIf}
-         LibMapLines := Explode(sLineBreak, LibMapOutput);
-         for LibMap in LibMapLines do begin
-           if rx.Exec(LibMap) and FileExists(rx.Match[2]) then begin
-@@ -3301,6 +3311,11 @@
- begin
-   // Init libmysql before actually connecting.
-   LibraryPath := GetLibDir + Parameters.LibraryOrProvider;
-+{$IF DEFINED(LINUX) OR DEFINED(FREEBSD)}
-+  LibraryPath := Parameters.LibraryOrProvider;
-+{$ELSE}
-+  LibraryPath := ExtractFilePath(ParamStr(0)) + Parameters.LibraryOrProvider;
-+{$ENDIF}
-   Log(lcDebug, f_('Loading library file %s ...', [LibraryPath]));
-   // Throws EDbError on any failure:
-   FLib := TMySQLLib.Create(LibraryPath, Parameters.DefaultLibrary);
-@@ -3315,7 +3330,11 @@
-   msg: String;
- begin
-   // Init lib before actually connecting.
--  LibraryPath := GetLibDir + Parameters.LibraryOrProvider;
-+{$IF DEFINED(LINUX) OR DEFINED(FREEBSD)}
-+  LibraryPath := Parameters.LibraryOrProvider;
-+{$ELSE}
-+  LibraryPath := ExtractFilePath(ParamStr(0)) + Parameters.LibraryOrProvider;
-+{$ENDIF}
-   Log(lcDebug, f_('Loading library file %s ...', [LibraryPath]));
-   try
-     FLib := TPostgreSQLLib.Create(LibraryPath, Parameters.DefaultLibrary);
-@@ -3346,7 +3365,11 @@
-   LibraryPath: String;
- begin
-   // Init lib before actually connecting.
--  LibraryPath := GetLibDir + Parameters.LibraryOrProvider;
-+{$IF DEFINED(LINUX) OR DEFINED(FREEBSD)}
-+  LibraryPath := Parameters.LibraryOrProvider;
-+{$ELSE}
-+  LibraryPath := ExtractFilePath(ParamStr(0)) + Parameters.LibraryOrProvider;
-+{$ENDIF}
-   Log(lcDebug, f_('Loading library file %s ...', [LibraryPath]));
-   // Throws EDbError on any failure:
-   if Parameters.NetType = ntSQLite then
-@@ -10238,14 +10261,14 @@
- 
- { TDBObjectComparer }
- 
--function TDBObjectComparer.Compare({$IF FPC_FULLVERSION<30204}constref{$ELSE}const{$ENDIF} Left, Right: TDBObject): Integer;
-+function TDBObjectComparer.Compare({$IF FPC_FULLVERSION<30203}constref{$ELSE}const{$ENDIF} Left, Right: TDBObject): Integer;
- begin
-   // Simple sort method for a TDBObjectList
-   Result := CompareAnyNode(Left.Schema+'.'+Left.Name, Right.Schema+'.'+Right.Name);
- end;
- 
- 
--function TDBObjectDropComparer.Compare({$IF FPC_FULLVERSION<30204}constref{$ELSE}const{$ENDIF} Left, Right: TDBObject): Integer;
-+function TDBObjectDropComparer.Compare({$IF FPC_FULLVERSION<30203}constref{$ELSE}const{$ENDIF} Left, Right: TDBObject): Integer;
- begin
-   // Sorting a TDBObject items so that dropping them does not trap in SQL errors
-   if (Left.NodeType = lntTrigger) and (Right.NodeType <> lntTrigger) then
diff --git a/databases/heidisql/files/patch-source_generic__types.pas b/databases/heidisql/files/patch-source_generic__types.pas
new file mode 100644
index 000000000000..40e00fab84ad
--- /dev/null
+++ b/databases/heidisql/files/patch-source_generic__types.pas
@@ -0,0 +1,39 @@
+--- source/generic_types.pas.orig	2026-01-30 17:33:07 UTC
++++ source/generic_types.pas
+@@ -5,7 +5,11 @@ uses fpjson, jsonparser, SysUtils, RegExpr, SynEditHig
+ interface
+ 
+ uses fpjson, jsonparser, SysUtils, RegExpr, SynEditHighlighter, SynHighlighterSQL,
+-  Classes, Generics.Collections, Graphics, dbstructures;
++  Classes, Generics.Collections, Graphics, dbstructures
++{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
++  , LazEditTextAttributes
++{$ENDIF}
++  ;
+ 
+ type
+   TThreeStateBoolean = (nbUnset, nbFalse, nbTrue);
+@@ -140,7 +144,11 @@ var
+ procedure TAppColorScheme.LoadFromSettings;
+ var
+   i: Integer;
++{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
++  Attri: TLazEditTextAttribute;
++{$ELSE}
+   Attri: TSynHighlighterAttributes;
++{$ENDIF}
+   dtc: TDBDatatypeCategoryIndex;
+ begin
+   Name := _('Current custom settings');
+@@ -179,7 +187,11 @@ var
+ procedure TAppColorScheme.Apply;
+ var
+   i: Integer;
++{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
++  Attri: TLazEditTextAttribute; 
++{$ELSE}
+   Attri: TSynHighlighterAttributes;
++{$ENDIF}
+ begin
+   // Highlighter colors
+   for i:=0 to SynSqlSyn.AttrCount - 1 do begin
diff --git a/databases/heidisql/files/patch-source_main.pas b/databases/heidisql/files/patch-source_main.pas
new file mode 100644
index 000000000000..5025fddeb390
--- /dev/null
+++ b/databases/heidisql/files/patch-source_main.pas
@@ -0,0 +1,53 @@
+--- source/main.pas.orig	2026-01-30 17:33:07 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
++{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
++  , LazEditTextAttributes
++{$ENDIF}
++  ;
+ 
+-
+ type
+ 
+   // Bind parameters for query tabs
+@@ -7062,7 +7065,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
+ 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
+   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
diff --git a/databases/heidisql/files/patch-source_preferences.pas b/databases/heidisql/files/patch-source_preferences.pas
new file mode 100644
index 000000000000..adc7bf97bf16
--- /dev/null
+++ b/databases/heidisql/files/patch-source_preferences.pas
@@ -0,0 +1,78 @@
+--- source/preferences.pas.orig	2026-01-30 17:33:07 UTC
++++ source/preferences.pas
+@@ -15,7 +15,11 @@ uses
+   SynEdit, laz.VirtualTrees, SynEditKeyCmds, ActnList, Menus,
+   dbstructures, RegExpr, EditBtn, LCLType, StrUtils,
+   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;
++{$ENDIF}
+   Foreground, Background: TColor;
+ begin
+   if comboSQLFontName.ItemIndex > -1 then
+@@ -890,8 +902,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
+ 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
+ procedure TfrmPreferences.SynMemoSQLSampleClick(Sender: TObject);
+ var
+   Token: String;
++{$IFDEF CPUAARCH64 AND $IFDEF FREEBSD}
++  Attri: TLazEditTextAttribute;
++{$ELSE}
+   Attri: TSynHighlighterAttributes;
++{$ENDIF}
+   AttriIdx: Integer;
+   sm: TSynEdit;
+ begin
diff --git a/databases/heidisql/pkg-plist b/databases/heidisql/pkg-plist
index 74be7c7b9f38..df919d6de624 100644
--- a/databases/heidisql/pkg-plist
+++ b/databases/heidisql/pkg-plist
@@ -1,9 +1,71 @@
 bin/heidisql
 share/applications/heidisql.desktop
 %%DATADIR%%/functions-mariadb.ini
 %%DATADIR%%/functions-mysql.ini
 %%DATADIR%%/functions-mysql8.ini
 %%DATADIR%%/functions-postgresql.ini
 %%DATADIR%%/functions-redshift.ini
 %%DATADIR%%/functions-sqlite.ini
+%%DATADIR%%/locale/heidisql.bg.mo
+%%DATADIR%%/locale/heidisql.ca.mo
+%%DATADIR%%/locale/heidisql.cs.mo
+%%DATADIR%%/locale/heidisql.da.mo
+%%DATADIR%%/locale/heidisql.de.mo
+%%DATADIR%%/locale/heidisql.el.mo
+%%DATADIR%%/locale/heidisql.en.mo
+%%DATADIR%%/locale/heidisql.es.mo
+%%DATADIR%%/locale/heidisql.eu.mo
+%%DATADIR%%/locale/heidisql.fi.mo
+%%DATADIR%%/locale/heidisql.fr.mo
+%%DATADIR%%/locale/heidisql.he.mo
+%%DATADIR%%/locale/heidisql.hu.mo
+%%DATADIR%%/locale/heidisql.id.mo
+%%DATADIR%%/locale/heidisql.it.mo
+%%DATADIR%%/locale/heidisql.ja.mo
+%%DATADIR%%/locale/heidisql.ka.mo
+%%DATADIR%%/locale/heidisql.ko.mo
+%%DATADIR%%/locale/heidisql.nl.mo
+%%DATADIR%%/locale/heidisql.no.mo
+%%DATADIR%%/locale/heidisql.pl.mo
+%%DATADIR%%/locale/heidisql.pt.mo
+%%DATADIR%%/locale/heidisql.pt_BR.mo
+%%DATADIR%%/locale/heidisql.ro.mo
+%%DATADIR%%/locale/heidisql.ru.mo
+%%DATADIR%%/locale/heidisql.sk.mo
+%%DATADIR%%/locale/heidisql.sl.mo
+%%DATADIR%%/locale/heidisql.sv.mo
+%%DATADIR%%/locale/heidisql.ta.mo
+%%DATADIR%%/locale/heidisql.tr.mo
+%%DATADIR%%/locale/heidisql.uk.mo
+%%DATADIR%%/locale/heidisql.vi.mo
+%%DATADIR%%/locale/heidisql.zh.mo
+%%DATADIR%%/locale/heidisql.zh_CN.mo
+%%DATADIR%%/locale/heidisql.zh_TW.mo
+%%DATADIR%%/locale/lclstrconsts.ca.mo
+%%DATADIR%%/locale/lclstrconsts.co.mo
+%%DATADIR%%/locale/lclstrconsts.cs.mo
+%%DATADIR%%/locale/lclstrconsts.de.mo
+%%DATADIR%%/locale/lclstrconsts.el.mo
+%%DATADIR%%/locale/lclstrconsts.es.mo
+%%DATADIR%%/locale/lclstrconsts.fi.mo
+%%DATADIR%%/locale/lclstrconsts.fr.mo
+%%DATADIR%%/locale/lclstrconsts.he.mo
+%%DATADIR%%/locale/lclstrconsts.hu.mo
+%%DATADIR%%/locale/lclstrconsts.id.mo
+%%DATADIR%%/locale/lclstrconsts.it.mo
+%%DATADIR%%/locale/lclstrconsts.ja.mo
+%%DATADIR%%/locale/lclstrconsts.ko.mo
+%%DATADIR%%/locale/lclstrconsts.lt.mo
+%%DATADIR%%/locale/lclstrconsts.nl.mo
+%%DATADIR%%/locale/lclstrconsts.no.mo
+%%DATADIR%%/locale/lclstrconsts.pl.mo
+%%DATADIR%%/locale/lclstrconsts.pt.mo
+%%DATADIR%%/locale/lclstrconsts.pt_BR.mo
+%%DATADIR%%/locale/lclstrconsts.ru.mo
+%%DATADIR%%/locale/lclstrconsts.si.mo
+%%DATADIR%%/locale/lclstrconsts.sk.mo
+%%DATADIR%%/locale/lclstrconsts.tr.mo
+%%DATADIR%%/locale/lclstrconsts.uk.mo
+%%DATADIR%%/locale/lclstrconsts.zh_CN.mo
+%%DATADIR%%/locale/lclstrconsts.zh_TW.mo
 share/icons/hicolor/256x256/apps/heidisql.png