diff --git a/.abf.yml b/.abf.yml
index 1c98fd6..cc3bb28 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  peazip-6.6.0.src.zip: 4b7fded54a918d8328c72c6b8816f28b5964f754
+  peazip-8.6.0.src.zip: 78d87efb62378c3cc2744e90141bca7730631657
diff --git a/peazip.spec b/peazip.spec
index a81fe8a..e22360f 100644
--- a/peazip.spec
+++ b/peazip.spec
@@ -2,7 +2,7 @@
 
 Summary:	File and archive manager
 Name:		peazip
-Version:	6.6.0
+Version:	8.6.0
 Release:	1
 License:	LGPLv3+
 Group:		File tools
@@ -13,12 +13,15 @@ Source1:	altconf.txt
 Source2:	rosa-peazip.desktop
 BuildRequires:	dos2unix
 BuildRequires:	lazarus >= 1.2.0
-BuildRequires:	qt4pas-devel
-BuildRequires:	qt4-devel
-# BuildRequires:	qtwebkit-devel
+BuildRequires:	qt5pas-devel
+BuildRequires:	qt5-devel
 BuildRequires:	icoutils
 Requires:	p7zip
 Requires:	upx >= 3.09
+Requires:	brotli
+Requires:	zstd
+# lazaris not build for ARM
+ExcludeArch:	%{armx}
 
 %description
 PeaZip is a free cross-platform file archiver that provides an unified
@@ -26,7 +29,7 @@ portable GUI for many Open Source technologies like 7-Zip, FreeArc, PAQ,
 UPX...
 
 %files
-%doc readme copying.txt
+%doc readme* copying*
 %{_bindir}/*
 %{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/applications/rosa-peazip.desktop
@@ -37,39 +40,34 @@ UPX...
 %prep
 %setup -qn %{name}-%{version}.src
 %apply_patches
-chmod +w res/lang
 dos2unix readme*
 
 %build
-lazbuild --lazarusdir=%{_libdir}/lazarus \
-%ifarch x86_64
-	--cpu=x86_64 \
-%endif
-	--widgetset=qt \
-	-B project_peach.lpi project_pea.lpi project_gwrap.lpi
+  lazbuild --lazarusdir=%{_libdir}/lazarus --widgetset=qt5 --build-all project_pea.lpi && [ -f pea ]
+  lazbuild --lazarusdir=%{_libdir}/lazarus --widgetset=qt5 --build-all project_peach.lpi && [ -f peazip ]
 
 %install
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/%{name}
-rm -rf res/icons
+#rm -rf res/share/icons
 cp -r res %{buildroot}%{_datadir}/%{name}
-cp %{SOURCE1} %{buildroot}%{_datadir}/%{name}/res
+cp %{SOURCE1} %{buildroot}%{_datadir}/%{name}/res/conf
 
 #install helper apps
-mkdir -p %{buildroot}%{_datadir}/%{name}/res/{7z,upx}
-ln -s %{_bindir}/7z %{buildroot}%{_datadir}/%{name}/res/7z
-ln -s %{_bindir}/upx %{buildroot}%{_datadir}/%{name}/res/upx
+mkdir -p %{buildroot}%{_datadir}/%{name}/res/bin/{7z,upx,zstd,brotli}
+ln -s %{_bindir}/7z %{buildroot}%{_datadir}/%{name}/res/bin/7z/7z
+ln -s %{_bindir}/upx %{buildroot}%{_datadir}/%{name}/res/bin/upx/upx
+ln -s %{_bindir}/zstd %{buildroot}%{_datadir}/%{name}/res/bin/zstd/zstd
+ln -s %{_bindir}/brotli %{buildroot}%{_datadir}/%{name}/res/bin/brotli/brotli
 
-install pea %{buildroot}%{_datadir}/%{name}/res
-ln -s %{_datadir}/%{name}/res/pea %{buildroot}%{_bindir}/pea
+install pea %{buildroot}%{_datadir}/%{name}
+ln -s %{_datadir}/%{name}/pea %{buildroot}%{_bindir}/pea
 install %{name} %{buildroot}%{_datadir}/%{name}
 ln -s %{_datadir}/%{name}/%{name} %{buildroot}%{_bindir}/%{name}
-install pealauncher %{buildroot}%{_datadir}/%{name}/res
-ln -s %{_datadir}/%{name}/res/pealauncher %{buildroot}%{_bindir}/pealauncher
 
 mkdir -p %{buildroot}%{_datadir}/applications
 cp %{SOURCE2} %{buildroot}%{_datadir}/applications/
 
 mkdir -p %{buildroot}%{_iconsdir}/hicolor/256x256/apps
 icotool -x -i 1 -o %{buildroot}%{_iconsdir}/hicolor/256x256/apps/%{name}.png %{name}.ico
-rm -rf %{buildroot}%{_datadir}/%{name}/res/icons
+#rm -rf %{buildroot}%{_datadir}/%{name}/res/share/icons