diff --git a/graphics/lazpaint/Makefile b/graphics/lazpaint/Makefile
index 2a7fc1e63b5b..7b75aa82567e 100644
--- a/graphics/lazpaint/Makefile
+++ b/graphics/lazpaint/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	lazpaint
-PORTVERSION=	6.4.1
+PORTVERSION=	7.0.7
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
@@ -23,9 +22,8 @@ DOS2UNIX_REGEX=	.*\.([txt]|pas|lpi|txt)
 USE_GITHUB=	yes
 GH_ACCOUNT=	bgrabitmap
 GH_PROJECT=	lazpaint
-GH_TAGNAME=	4fc4381
-GH_TUPLE=	bgrabitmap:bgracontrols:ec090e5:bgracontrols/bgracontrols \
-		bgrabitmap:bgrabitmap:cd2d856:bgrabitmap/bgrabitmapnew
+GH_TUPLE=	bgrabitmap:bgracontrols:272a141:bgracontrols/bgracontrols \
+		bgrabitmap:bgrabitmap:e709548:bgrabitmap/bgrabitmapnew
 
 USE_FPC_gtk2=	cairo
 USE_GNOME_gtk2=	cairo
@@ -34,16 +32,17 @@ USE_GNOME+=	${USE_GNOME_${FLAVOR}}
 
 LAZARUS_PROJECT_FILES=	bgrabitmapnew/bgrabitmap/bgrabitmappack.lpk
 LAZARUS_PROJECT_FILES+=	bgracontrols/bgracontrols.lpk
+LAZARUS_PROJECT_FILES+=	lazpaintcontrols/lazpaintcontrols.lpk
 LAZARUS_PROJECT_FILES+=	lazpaint/lazpaint.lpi
 
-LAZBUILD_ARGS=	-d
+LAZBUILD_ARGS=	-d --bm=Release
 
 post-patch:
 	${REINPLACE_CMD} 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/lazpaint/utranslation.pas
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lazpaint/release/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/lazpaint/release/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC}/lazpaint/release && ${COPYTREE_SHARE} "i18n models" ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC}/lazpaint/release/bin && ${COPYTREE_SHARE} "i18n models" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/lazpaint/distinfo b/graphics/lazpaint/distinfo
index c1d3807da0bf..d4ade2f15efd 100644
--- a/graphics/lazpaint/distinfo
+++ b/graphics/lazpaint/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1551905934
-SHA256 (bgrabitmap-lazpaint-v6.4.1-4fc4381_GH0.tar.gz) = 87112a2d0175dc314433a1cd2d5abb051eeb75e07075fc22e50e78e7ab870bfd
-SIZE (bgrabitmap-lazpaint-v6.4.1-4fc4381_GH0.tar.gz) = 8905571
-SHA256 (bgrabitmap-bgracontrols-ec090e5_GH0.tar.gz) = 28fbc7c702671d819b54c338568d15e5a04dfbbdbd5729f1dec8005b83b097af
-SIZE (bgrabitmap-bgracontrols-ec090e5_GH0.tar.gz) = 4617920
-SHA256 (bgrabitmap-bgrabitmap-cd2d856_GH0.tar.gz) = 3de143c6840c2aef020ca04f5bbec1e78aaba4233abe64d61febe9b686d034ab
-SIZE (bgrabitmap-bgrabitmap-cd2d856_GH0.tar.gz) = 3935613
+TIMESTAMP = 1577767927
+SHA256 (bgrabitmap-lazpaint-v7.0.7_GH0.tar.gz) = 11aa845762ea4ad34c244479fd457bd44c11d64189811e610d37dad6779e5d07
+SIZE (bgrabitmap-lazpaint-v7.0.7_GH0.tar.gz) = 28897384
+SHA256 (bgrabitmap-bgracontrols-272a141_GH0.tar.gz) = 0e2ab6392df4f95ba267b60715d71baf0b0bd5144ad48c16396431754b05fbb1
+SIZE (bgrabitmap-bgracontrols-272a141_GH0.tar.gz) = 5553048
+SHA256 (bgrabitmap-bgrabitmap-e709548_GH0.tar.gz) = a18fb1abbc5a4dd5f57b8c6913c4d80a2767fd6944faf39bafc78f84fbf67747
+SIZE (bgrabitmap-bgrabitmap-e709548_GH0.tar.gz) = 6159285
diff --git a/graphics/lazpaint/files/patch-lazpaint_lazpaintmainform.pas b/graphics/lazpaint/files/patch-lazpaint_lazpaintmainform.pas
deleted file mode 100644
index 505e1f62d0e0..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_lazpaintmainform.pas
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazpaint/lazpaintmainform.pas	2018-04-25 23:51:57.849654000 -0500
-+++ lazpaint/lazpaintmainform.pas	2018-04-25 23:52:24.210190000 -0500
-@@ -17,7 +17,7 @@
- 
-   LazPaintType, UMainFormLayout, UTool, UImage, UImageAction, ULayerAction, UZoom,
-   UImageObservation, UConfig, UScaleDPI, UResourceStrings,
--  UMenu, uscripting, ubrowseimages, UToolPolygon, UBarUpDown;
-+  UMenu, uscripting, ubrowseimages, UToolPolygon, UBarUpDown, LazFileUtils, LazUTF8;
- 
- const
-   MinPenWidthValue = 10;
diff --git a/graphics/lazpaint/files/patch-lazpaint_uadjustcurves.pas b/graphics/lazpaint/files/patch-lazpaint_uadjustcurves.pas
deleted file mode 100644
index edb43b0d0db5..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_uadjustcurves.pas
+++ /dev/null
@@ -1,30 +0,0 @@
---- lazpaint/uadjustcurves.pas	2018-04-25 23:53:59.146788000 -0500
-+++ lazpaint/uadjustcurves.pas	2018-04-25 23:57:23.786990000 -0500
-@@ -156,8 +156,8 @@
-   begin
-       with CoordToBitmap(i/FNbGrid,i/FNbGrid) do
-       begin
--        Bitmap.DrawLineAntialias(round(FPoint0.x),round(y),Bitmap.Width,round(y),FGridColor,BGRAPixelTransparent,FTickSize,false);
--        Bitmap.DrawLineAntialias(round(x),round(FPoint0.y),round(x),0,FGridColor,BGRAPixelTransparent,FTickSize,false);
-+        Bitmap.DrawLineAntialias(System.round(FPoint0.x),System.round(y),Bitmap.Width,System.round(y),FGridColor,BGRAPixelTransparent,FTickSize,false);
-+        Bitmap.DrawLineAntialias(System.round(x),System.round(FPoint0.y),System.round(x),0,FGridColor,BGRAPixelTransparent,FTickSize,false);
-       end;
-   end;
-   curve := SelectedCurve;
-@@ -515,14 +515,14 @@
-     with GetCoord(0,i/high(labels)) do
-     begin
-       Bitmap.TextOut(x-FTickSize,y-th div 2,labels[i],axesColor,taRightJustify);
--      Bitmap.DrawLine(round(x),round(y),round(x-FTickSize),round(y),axesColor,False);
-+      Bitmap.DrawLine(System.round(x),System.round(y),System.round(x-FTickSize),System.round(y),axesColor,False);
-     end;
-     with GetCoord(i/high(labels),0) do
-     begin
-       if i = 0 then
-         Bitmap.TextOut(x,y+FTickSize,labels[i],axesColor,taLeftJustify) else
-         Bitmap.TextOut(x,y+FTickSize,labels[i],axesColor,taCenter);
--      Bitmap.DrawLine(round(x),round(y),round(x),round(y+FTickSize),axesColor,False);
-+      Bitmap.DrawLine(System.round(x),System.round(y),System.round(x),System.round(y+FTickSize),axesColor,False);
-     end;
-   end;
-   Bitmap.DrawLine(leftMargin, 0, leftMargin, Bitmap.Height - bottomMargin, axesColor, False);
diff --git a/graphics/lazpaint/files/patch-lazpaint_ubrowseimages.pas b/graphics/lazpaint/files/patch-lazpaint_ubrowseimages.pas
deleted file mode 100644
index 72c7cf11c50d..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_ubrowseimages.pas
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazpaint/ubrowseimages.pas	2018-04-25 23:50:38.459232000 -0500
-+++ lazpaint/ubrowseimages.pas	2018-04-25 23:50:47.539703000 -0500
-@@ -7,7 +7,7 @@
- uses
-   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
-   ComCtrls, ExtCtrls, Buttons, StdCtrls, BGRAVirtualScreen, BGRABitmap,
--  BGRABitmapTypes, BGRAAnimatedGif, UMySLV, LazPaintType, Masks, LCLType;
-+  BGRABitmapTypes, BGRAAnimatedGif, UMySLV, LazPaintType, Masks, LCLType, LazFileUtils;
- 
- const
-   MaxIconCacheCount = 512;
diff --git a/graphics/lazpaint/files/patch-lazpaint_uclipboard.pas b/graphics/lazpaint/files/patch-lazpaint_uclipboard.pas
deleted file mode 100644
index 368a617ce78b..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_uclipboard.pas
+++ /dev/null
@@ -1,12 +0,0 @@
---- lazpaint/uclipboard.pas	2019-03-06 21:05:00.151107000 +0000
-+++ lazpaint/uclipboard.pas	2019-03-06 21:05:59.844861000 +0000
-@@ -473,8 +473,7 @@
-     end;
- 
-   for i := 0 to clipboard.FormatCount-1 do
--    if (Clipboard.Formats[i] = PredefinedClipboardFormat(pcfDelphiBitmap)) or
--       (Clipboard.Formats[i] = PredefinedClipboardFormat(pcfBitmap)) then
-+    if (Clipboard.Formats[i] = PredefinedClipboardFormat(pcfBitmap)) then
-     begin
-        Stream := TMemoryStream.Create;
-        Clipboard.GetFormat(Clipboard.Formats[i],Stream);
diff --git a/graphics/lazpaint/files/patch-lazpaint_ucommandline.pas b/graphics/lazpaint/files/patch-lazpaint_ucommandline.pas
deleted file mode 100644
index 632809159b3c..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_ucommandline.pas
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazpaint/ucommandline.pas	2018-04-26 00:01:03.521298000 -0500
-+++ lazpaint/ucommandline.pas	2018-04-26 00:01:21.335693000 -0500
-@@ -4,7 +4,7 @@
- 
- interface
- 
--uses classes, LazpaintType, uresourcestrings;
-+uses classes, LazpaintType, uresourcestrings, LazUTF8, LazFileUtils;
- 
- procedure ProcessCommands(instance: TLazPaintCustomInstance; commandsUTF8: TStringList; out errorEncountered, fileSaved: boolean);
- function ParamStrUTF8(AIndex: integer): string;
diff --git a/graphics/lazpaint/files/patch-lazpaint_uconfig.pas b/graphics/lazpaint/files/patch-lazpaint_uconfig.pas
deleted file mode 100644
index 6af395b5860e..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_uconfig.pas
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazpaint/uconfig.pas	2018-04-25 23:39:35.445237000 -0500
-+++ lazpaint/uconfig.pas	2018-04-25 23:39:48.185933000 -0500
-@@ -5,7 +5,7 @@
- interface
- 
- uses
--  Classes, SysUtils, IniFiles, BGRABitmapTypes, Graphics, LCLType, uscripting;
-+  Classes, SysUtils, IniFiles, BGRABitmapTypes, Graphics, LCLType, uscripting, LazUTF8, LazUTF8Sysutils, LazFileUtils;
- 
- type
-   TLazPaintConfig = class;
diff --git a/graphics/lazpaint/files/patch-lazpaint_ucustomblur.pas b/graphics/lazpaint/files/patch-lazpaint_ucustomblur.pas
deleted file mode 100644
index 41f42d7f4fca..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_ucustomblur.pas
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazpaint/ucustomblur.pas	2018-04-25 23:58:21.378496000 -0500
-+++ lazpaint/ucustomblur.pas	2018-04-25 23:58:39.088932000 -0500
-@@ -7,7 +7,7 @@
- uses
-   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-   StdCtrls, ExtCtrls, ExtDlgs,  bgrabitmap, LazPaintType, UScaleDPI,
--  UResourceStrings, UFilterConnector, UFilterThread, ubrowseimages;
-+  UResourceStrings, UFilterConnector, UFilterThread, ubrowseimages, LazFileUtils;
- 
- type
- 
diff --git a/graphics/lazpaint/files/patch-lazpaint_ugraph.pas b/graphics/lazpaint/files/patch-lazpaint_ugraph.pas
deleted file mode 100644
index e8f8184a16c2..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_ugraph.pas
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazpaint/ugraph.pas	2018-04-26 00:33:20.456108000 -0500
-+++ lazpaint/ugraph.pas	2018-04-26 00:33:27.797858000 -0500
-@@ -6,7 +6,7 @@
- 
- uses
-   Classes, SysUtils, bgrabitmap, bgrabitmaptypes, LazPaintType, Graphics, BGRALayers, LCLType,
--  BCButton;
-+  BCButton, LazUTF8;
- 
- const FrameDashLength = 4;
-   NicePointMaxRadius = 4;
diff --git a/graphics/lazpaint/files/patch-lazpaint_uimage.pas b/graphics/lazpaint/files/patch-lazpaint_uimage.pas
deleted file mode 100644
index 080b9da29a2d..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_uimage.pas
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazpaint/uimage.pas	2018-04-25 23:44:24.819000000 -0500
-+++ lazpaint/uimage.pas	2018-04-25 23:44:47.194779000 -0500
-@@ -7,7 +7,7 @@
- uses
-   Classes, SysUtils, BGRABitmap, BGRABitmapTypes, types,
-   UImageState, UStateType, Graphics, BGRALayers, UImageObservation, FPWriteBMP,
--  UImageType, BGRALzpCommon, UZoom;
-+  UImageType, BGRALzpCommon, UZoom, LazUTF8;
- 
- const
-   MaxLayersToAdd = 99;
diff --git a/graphics/lazpaint/files/patch-lazpaint_uimagelist.pas b/graphics/lazpaint/files/patch-lazpaint_uimagelist.pas
deleted file mode 100644
index c59682f468e0..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_uimagelist.pas
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazpaint/uimagelist.pas	2018-04-25 23:59:46.369724000 -0500
-+++ lazpaint/uimagelist.pas	2018-04-26 00:00:08.521184000 -0500
-@@ -7,7 +7,7 @@
- 
- uses
-   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
--  Grids, StdCtrls, Buttons, ComCtrls, ExtCtrls, Menus,
-+  Grids, StdCtrls, Buttons, ComCtrls, ExtCtrls, Menus, LazFileUtils,
-   LazPaintType, UResourceStrings, UConfig, BGRAImageList, ubrowseimages;
- 
- type
diff --git a/graphics/lazpaint/files/patch-lazpaint_umenu.pas b/graphics/lazpaint/files/patch-lazpaint_umenu.pas
deleted file mode 100644
index eacee7c85619..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_umenu.pas
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazpaint/umenu.pas	2018-04-25 23:45:43.826606000 -0500
-+++ lazpaint/umenu.pas	2018-04-25 23:46:07.106133000 -0500
-@@ -5,7 +5,7 @@
- interface
- 
- uses
--  Classes, SysUtils, ActnList, Forms, Menus, UTool, LCLType, ExtCtrls, UConfig;
-+  Classes, SysUtils, ActnList, Forms, Menus, UTool, LCLType, ExtCtrls, UConfig, LazUTF8;
- 
- type
- 
diff --git a/graphics/lazpaint/files/patch-lazpaint_umyslv.pas b/graphics/lazpaint/files/patch-lazpaint_umyslv.pas
deleted file mode 100644
index 38f83085baac..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_umyslv.pas
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazpaint/umyslv.pas	2018-04-25 23:49:08.994450000 -0500
-+++ lazpaint/umyslv.pas	2018-04-25 23:49:18.561675000 -0500
-@@ -6,7 +6,7 @@
- 
- uses
-   Classes, Types, SysUtils, ComCtrls, ShellCtrls, Controls, Graphics, BGRABitmap,
--  BGRAVirtualScreen, BGRABitmapTypes, UVolatileScrollBar;
-+  BGRAVirtualScreen, BGRABitmapTypes, UVolatileScrollBar, LazFileUtils;
- 
- type
-   PMyShellListViewItemData = ^TMyShellListViewItemData;
diff --git a/graphics/lazpaint/files/patch-lazpaint_uobject3d.pas b/graphics/lazpaint/files/patch-lazpaint_uobject3d.pas
deleted file mode 100644
index e8d47607f686..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_uobject3d.pas
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazpaint/uobject3d.pas	2018-04-25 23:47:42.778665000 -0500
-+++ lazpaint/uobject3d.pas	2018-04-25 23:47:53.371177000 -0500
-@@ -8,7 +8,7 @@
-   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-   StdCtrls, Spin, ExtCtrls, ComCtrls, BGRAVirtualScreen, BGRAKnob,
-   BGRAImageList, BGRABitmap, BGRAScene3D, LazPaintType, BGRABitmapTypes,
--  UConfig;
-+  UConfig, LazFileUtils;
- 
- const
-   AntialiasingLevelWhenFixed = 2;
diff --git a/graphics/lazpaint/files/patch-lazpaint_uonline.pas b/graphics/lazpaint/files/patch-lazpaint_uonline.pas
deleted file mode 100644
index b55a93213104..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_uonline.pas
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazpaint/uonline.pas	2018-04-26 00:04:51.587890000 -0500
-+++ lazpaint/uonline.pas	2018-04-26 00:05:12.232466000 -0500
-@@ -6,7 +6,7 @@
- 
- uses
-   fphttpclient, Classes, SysUtils,
--  UConfig, LazPaintType;
-+  UConfig, LazPaintType, LazFileUtils;
- 
- type
-   { THttpGetThread }
diff --git a/graphics/lazpaint/files/patch-lazpaint_utooltext b/graphics/lazpaint/files/patch-lazpaint_utooltext
deleted file mode 100644
index 73920cf21b7e..000000000000
--- a/graphics/lazpaint/files/patch-lazpaint_utooltext
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazpaint/utooltext.pas	2018-04-26 00:06:41.961489000 -0500
-+++ lazpaint/utooltext.pas	2018-04-26 00:06:59.416755000 -0500
-@@ -6,7 +6,7 @@
- 
- uses
-   Types, Classes, SysUtils, utool, utoolbasic, LCLType, Graphics, BGRABitmap, BGRABitmapTypes, BGRATextFX,
--  BGRAGradients, ULayerAction;
-+  BGRAGradients, ULayerAction, LazUTF8;
- 
- type
- 
diff --git a/graphics/lazpaint/files/patch-lazpaint_utranslation.pas b/graphics/lazpaint/files/patch-lazpaint_utranslation.pas
index 6d4291ee249f..6b57c5c19520 100644
--- a/graphics/lazpaint/files/patch-lazpaint_utranslation.pas
+++ b/graphics/lazpaint/files/patch-lazpaint_utranslation.pas
@@ -1,29 +1,19 @@
---- lazpaint/utranslation.pas	2018-04-26 00:02:18.729349000 -0500
-+++ lazpaint/utranslation.pas	2018-04-26 00:17:20.943460000 -0500
-@@ -8,7 +8,7 @@
-   {$ifdef Darwin}
-   MacOSAll,
-  {$endif}
--  Classes, SysUtils, UConfig, IniFiles;
-+  Classes, SysUtils, UConfig, IniFiles, LazFileUtils, LazUTF8;
- 
- {*************** Language ****************}
- const
-@@ -62,7 +62,7 @@
-       result := GetResourcesPath+'i18n'+PathDelim
-     else
+--- lazpaint/utranslation.pas	2019-12-30 23:16:40.903045000 -0500
++++ lazpaint/utranslation.pas	2019-12-30 23:26:13.503822000 -0500
+@@ -60,10 +60,13 @@
+   {$ELSE}
+     {$IFDEF DARWIN}
+     if DirectoryExists(GetResourcesPath+'i18n') then
+-      result := GetResourcesPath+'i18n'+PathDelim
+-    else
++      result := GetResourcesPath+'i18n'+PathDelim;
      {$ENDIF}
--    result:='i18n'+PathDelim;
-+    result:='%%DATADIR%%'+PathDelim+'i18n'+PathDelim;
+-    result:=ExtractFilePath(Application.ExeName)+'i18n'+PathDelim;
++    {$IFDEF FREEBSD}
++      result:='%%DATADIR%%'+PathDelim+'i18n'+PathDelim;
++    {$ELSE}
++      result:=ExtractFilePath(Application.ExeName)+'i18n'+PathDelim;
++    {$ENDIF}
    {$ENDIF}
  end;
  
-@@ -76,7 +76,7 @@
- begin
-   Lang:='';
-   FallbackLang:='';
--  LCLGetLanguageIDs(Lang,FallbackLang);
-+  LazGetLanguageIDs(Lang,FallbackLang);
-   result := FallbackLang;
- end;
- 
diff --git a/graphics/lazpaint/pkg-plist b/graphics/lazpaint/pkg-plist
index dc53f6048e50..8aafd6499727 100644
--- a/graphics/lazpaint/pkg-plist
+++ b/graphics/lazpaint/pkg-plist
@@ -9,6 +9,7 @@ bin/lazpaint
 %%DATADIR%%/i18n/lazpaint.lv.po
 %%DATADIR%%/i18n/lazpaint.nl.po
 %%DATADIR%%/i18n/lazpaint.po
+%%DATADIR%%/i18n/lazpaint.pot
 %%DATADIR%%/i18n/lazpaint.pt_BR.po
 %%DATADIR%%/i18n/lazpaint.ru.po
 %%DATADIR%%/i18n/lazpaint.sv.po