diff --git a/peazip-9.7.1.src.zip b/peazip-9.7.1.src.zip
deleted file mode 100644
index fc98053..0000000
--- a/peazip-9.7.1.src.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18aed692f6300642d4b8ab6d5a2bbd2c5bc46d2c12d9ba693334d90e4cc0de16
-size 5481007
diff --git a/peazip-9.8.0.src.zip b/peazip-9.8.0.src.zip
new file mode 100644
index 0000000..53298c6
--- /dev/null
+++ b/peazip-9.8.0.src.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:023e95eb698e1645a66315b9db1bf5f996fbc32c9ec41c64d96a2e02e00ab5de
+size 8000860
diff --git a/peazip-build_PIE.patch b/peazip-build_PIE.patch
index 831ebeb..4d5956c 100644
--- a/peazip-build_PIE.patch
+++ b/peazip-build_PIE.patch
@@ -5,29 +5,29 @@ Subject: Build PIE binaries
 Set lazarus project files so that we produce position
 independent executables.
 
-Index: peazip-9.7.0.src/dev/project_pea.lpi
+Index: peazip-9.8.0.src/dev/project_pea.lpi
 ===================================================================
---- peazip-9.7.0.src.orig/dev/project_pea.lpi
-+++ peazip-9.7.0.src/dev/project_pea.lpi
-@@ -555,6 +555,8 @@
+--- peazip-9.8.0.src.orig/dev/project_pea.lpi
++++ peazip-9.8.0.src/dev/project_pea.lpi
+@@ -560,6 +560,8 @@
          <DebugInfoType Value="dsDwarf3"/>
        </Debugging>
        <Options>
-+        <PassLinkerOptions Value="True"/>
-+        <LinkerOptions Value="-pie"/>
++       <PassLinkerOptions Value="True"/>
++       <LinkerOptions Value="-pie"/>
          <Win32>
            <GraphicApplication Value="True"/>
          </Win32>
-Index: peazip-9.7.0.src/dev/project_peach.lpi
+Index: peazip-9.8.0.src/dev/project_peach.lpi
 ===================================================================
---- peazip-9.7.0.src.orig/dev/project_peach.lpi
-+++ peazip-9.7.0.src/dev/project_peach.lpi
-@@ -1645,6 +1645,8 @@
+--- peazip-9.8.0.src.orig/dev/project_peach.lpi
++++ peazip-9.8.0.src/dev/project_peach.lpi
+@@ -1642,6 +1642,8 @@
          <GenerateDebugInfo Value="False"/>
        </Debugging>
        <Options>
-+        <PassLinkerOptions Value="True"/>
-+        <LinkerOptions Value="-pie"/>
++       <PassLinkerOptions Value="True"/>
++       <LinkerOptions Value="-pie"/>
          <Win32>
            <GraphicApplication Value="True"/>
          </Win32>
diff --git a/peazip-debuginfo.patch b/peazip-debuginfo.patch
index 180efdc..5c08367 100644
--- a/peazip-debuginfo.patch
+++ b/peazip-debuginfo.patch
@@ -1,8 +1,8 @@
-Index: peazip-9.7.0.src/dev/project_pea.lpi
+Index: peazip-9.8.0.src/dev/project_pea.lpi
 ===================================================================
---- peazip-9.7.0.src.orig/dev/project_pea.lpi
-+++ peazip-9.7.0.src/dev/project_pea.lpi
-@@ -551,7 +551,7 @@
+--- peazip-9.8.0.src.orig/dev/project_pea.lpi
++++ peazip-9.8.0.src/dev/project_pea.lpi
+@@ -556,7 +556,7 @@
      </CodeGeneration>
      <Linking>
        <Debugging>
@@ -11,11 +11,11 @@ Index: peazip-9.7.0.src/dev/project_pea.lpi
          <DebugInfoType Value="dsDwarf3"/>
        </Debugging>
        <Options>
-Index: peazip-9.7.0.src/dev/project_peach.lpi
+Index: peazip-9.8.0.src/dev/project_peach.lpi
 ===================================================================
---- peazip-9.7.0.src.orig/dev/project_peach.lpi
-+++ peazip-9.7.0.src/dev/project_peach.lpi
-@@ -1642,7 +1642,7 @@
+--- peazip-9.8.0.src.orig/dev/project_peach.lpi
++++ peazip-9.8.0.src/dev/project_peach.lpi
+@@ -1639,7 +1639,7 @@
      </CodeGeneration>
      <Linking>
        <Debugging>
@@ -23,4 +23,4 @@ Index: peazip-9.7.0.src/dev/project_peach.lpi
 +        <GenerateDebugInfo Value="True"/>
        </Debugging>
        <Options>
-         <PassLinkerOptions Value="True"/>
+        <PassLinkerOptions Value="True"/>
diff --git a/peazip-desktop.patch b/peazip-desktop.patch
index 5218ce6..266ddea 100644
--- a/peazip-desktop.patch
+++ b/peazip-desktop.patch
@@ -1,7 +1,7 @@
-Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipadd.desktop
+Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipadd.desktop
 ===================================================================
---- peazip-9.7.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipadd.desktop
-+++ peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipadd.desktop
+--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipadd.desktop
++++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipadd.desktop
 @@ -2,6 +2,8 @@
  Exec=peazip -add2archive %F
  Icon=peazip
@@ -16,10 +16,10 @@ Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
  Icon=peazip
  ServiceTypes=KonqPopupMenu/Plugin,all/all
 +X-SuSE-translate=true
-Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipext.desktop
+Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipext.desktop
 ===================================================================
---- peazip-9.7.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipext.desktop
-+++ peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipext.desktop
+--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipext.desktop
++++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipext.desktop
 @@ -1,7 +1,9 @@
  [Desktop Action peazipext]
  Exec=peazip -ext2full %F
@@ -36,10 +36,10 @@ Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
  Name[en_US]=peazipext
  ServiceTypes=KonqPopupMenu/Plugin,all/all
 +X-SuSE-translate=true
-Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipextfolder.desktop
+Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipextfolder.desktop
 ===================================================================
---- peazip-9.7.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipextfolder.desktop
-+++ peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipextfolder.desktop
+--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipextfolder.desktop
++++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipextfolder.desktop
 @@ -1,7 +1,9 @@
  [Desktop Action peazipextfolder]
  Exec=peazip -ext2folder %F
@@ -56,10 +56,10 @@ Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
  Name[en_US]=peazipextfolder
  ServiceTypes=KonqPopupMenu/Plugin,all/all
 +X-SuSE-translate=true
-Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipexthere.desktop
+Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipexthere.desktop
 ===================================================================
---- peazip-9.7.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipexthere.desktop
-+++ peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipexthere.desktop
+--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipexthere.desktop
++++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipexthere.desktop
 @@ -1,7 +1,9 @@
  [Desktop Action peazipexthere]
  Exec=peazip -ext2here %F
@@ -76,10 +76,10 @@ Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
  Name[en_US]=peazipexthere
  ServiceTypes=KonqPopupMenu/Plugin,all/all
 +X-SuSE-translate=true
-Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipopen.desktop
+Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipopen.desktop
 ===================================================================
---- peazip-9.7.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipopen.desktop
-+++ peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipopen.desktop
+--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipopen.desktop
++++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipopen.desktop
 @@ -2,6 +2,8 @@
  Exec=peazip -ext2browse %F
  Icon=peazip
@@ -94,10 +94,10 @@ Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
  Name[en_US]=peazipopen
  ServiceTypes=KonqPopupMenu/Plugin,all/all
 +X-SuSE-translate=true
-Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipadd.desktop
+Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipadd.desktop
 ===================================================================
---- peazip-9.7.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipadd.desktop
-+++ peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipadd.desktop
+--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipadd.desktop
++++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipadd.desktop
 @@ -1,7 +1,9 @@
  [Desktop Action peazipadd]
  Exec=peazip -add2archive %F
@@ -109,10 +109,10 @@ Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
  
  [Desktop Entry]
  Type=Service
-Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipext.desktop
+Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipext.desktop
 ===================================================================
---- peazip-9.7.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipext.desktop
-+++ peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipext.desktop
+--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipext.desktop
++++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipext.desktop
 @@ -1,7 +1,9 @@
  [Desktop Action peazipext]
  Exec=peazip -ext2full %F
@@ -124,10 +124,10 @@ Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
  
  [Desktop Entry]
  Type=Service
-Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipextfolder.desktop
+Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipextfolder.desktop
 ===================================================================
---- peazip-9.7.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipextfolder.desktop
-+++ peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipextfolder.desktop
+--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipextfolder.desktop
++++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipextfolder.desktop
 @@ -1,7 +1,9 @@
  [Desktop Action peazipextfolder]
  Exec=peazip -ext2folder %F
@@ -139,10 +139,10 @@ Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
  
  [Desktop Entry]
  Type=Service
-Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipexthere.desktop
+Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipexthere.desktop
 ===================================================================
---- peazip-9.7.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipexthere.desktop
-+++ peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipexthere.desktop
+--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipexthere.desktop
++++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipexthere.desktop
 @@ -1,7 +1,9 @@
  [Desktop Action peazipexthere]
  Exec=peazip -ext2here %F
@@ -154,10 +154,10 @@ Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
  
  [Desktop Entry]
  Type=Service
-Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipopen.desktop
+Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipopen.desktop
 ===================================================================
---- peazip-9.7.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipopen.desktop
-+++ peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipopen.desktop
+--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipopen.desktop
++++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipopen.desktop
 @@ -1,7 +1,9 @@
  [Desktop Action peazipopen]
  Exec=peazip -ext2browse %F
@@ -169,10 +169,10 @@ Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
  
  [Desktop Entry]
  Type=Service
-Index: peazip-9.7.0.src/res/share/batch/freedesktop_integration/peazip.desktop
+Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/peazip.desktop
 ===================================================================
---- peazip-9.7.0.src.orig/res/share/batch/freedesktop_integration/peazip.desktop
-+++ peazip-9.7.0.src/res/share/batch/freedesktop_integration/peazip.desktop
+--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/peazip.desktop
++++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/peazip.desktop
 @@ -1,14 +1,21 @@
  [Desktop Entry]
  Name=PeaZip
diff --git a/peazip-help_path.patch b/peazip-help_path.patch
index 039b118..460e1c6 100644
--- a/peazip-help_path.patch
+++ b/peazip-help_path.patch
@@ -1,8 +1,8 @@
-Index: peazip-9.7.1.src/dev/peach.pas
+Index: peazip-9.8.0.src/dev/peach.pas
 ===================================================================
---- peazip-9.7.1.src.orig/dev/peach.pas
-+++ peazip-9.7.1.src/dev/peach.pas
-@@ -45281,7 +45281,7 @@ end;
+--- peazip-9.8.0.src.orig/dev/peach.pas
++++ peazip-9.8.0.src/dev/peach.pas
+@@ -45543,7 +45543,7 @@ end;
  
  procedure TForm_peach.baboutlocalhelpClick(Sender: TObject);
  begin
@@ -11,7 +11,7 @@ Index: peazip-9.7.1.src/dev/peach.pas
  end;
  
  procedure TForm_peach.baboutplugindirClick(Sender: TObject);
-@@ -70211,7 +70211,7 @@ end;
+@@ -70892,7 +70892,7 @@ end;
  
  procedure TForm_peach.mpeahelpofflineClick(Sender: TObject);
  begin
diff --git a/peazip.changes b/peazip.changes
index 72b7f1e..280d545 100644
--- a/peazip.changes
+++ b/peazip.changes
@@ -1,3 +1,59 @@
+-------------------------------------------------------------------
+Mon May 13 10:55:46 UTC 2024 - PragmaticLinux <info@pragmaticlinux.com>
+
+- Update to 9.8.0:
+  BACKEND
+  * Pea 1.18
+
+  CODE
+  * Code cleanup
+  * Compiled with Lazarus 3.2, sources are still compatible with Lazarus 2.x line
+  * Various fixes
+    * Fixed directory name sorting which for some widget sets was wrongly displayed in
+      treeview and breadcrumb dropdown menus
+    * Fixed drag and drop extraction failing for some paths (Windows)
+    * Fixed inability to browse symlinked directories on Windows (other systems are
+      immune from the issue)
+
+  FILE MANAGER
+  * Added "Always browse archives in flat view" option switch in main menu > Browse and
+    app's context menu > Navigation
+  * Added Comment, and Info functions to Status bar context menu, to improve its
+    usefulness in providing information to user
+  * Improved direct extraction of archives from context menu
+    * From context menu "Extract to" submenu it is now possible to directly extract all
+      or selected item(s), without further confirmation, to any output path in bookmarks,
+      history or breadcrumb
+    * Extract here links (optionally to smart folder or to new folder) can now extract
+      all or selected items
+      * In the dropdown menu of Extract button are still available "Extract all" entries
+    * Selection and navigation submenus in extraction and archiving screens are now
+      organized in same way of extract here submenu: bookmarks are shown first, history,
+      session history, and breadcrumb are shown in History submenu
+    * Rename dialog now allows to directly switch to Move to dialog (change file path
+      string rather than file name string)
+  * Updated themes
+    * New Mac and Tux themes
+    * Old themes and additional custom themes are still available online, clicking "Check
+      for Themes" button on Themes screen (Windows 10+) The application, which by default
+      follows system colors, can be manually forced to light or dark mode, regardless
+      system mode, creating an empty file named "light" or "dark" in the same path of the
+      executable (not integrated with themes due to technical limitations)
+
+  EXTRACTION and ARCHIVING
+  * Added new command line switches, which can be used both in scripts and for system
+    integration (context menus, SendTo items, .desktop files, Automator scripts)
+    * -ext2neutral directly extracts archives in current path applying the "new folder"
+      policy as defined in PeaZip app (non, new folder, smart new folder, or force new
+      folder)
+    * -ext2downloads, -ext2desktop, -ext2documents directly extract archives in
+      Downloads, Desktop, or Documents path (applying app's new folder policy)
+    * -ext2bookmark(1..8) extract archives in the path of the bookmarked item number 1 to 8
+    * Windows context menu versions of those switches begins with -ext2multi instead of -ext2
+    * Created sample scripts (.bat, .sh), W11 mini-context menu entries, SendTo items,
+      .desktop files and macOS service menus for -ext2downloads, -ext2desktop,
+      -ext2documents switches, in (PeaZip)/res/share/batch directory
+
 -------------------------------------------------------------------
 Thu Feb 15 07:28:15 UTC 2024 - Paolo Stivanin <info@paolostivanin.com>
 
diff --git a/peazip.spec b/peazip.spec
index 97d5c24..1324dc2 100644
--- a/peazip.spec
+++ b/peazip.spec
@@ -19,7 +19,7 @@
 %define         _peazipinstalldir %{_libdir}/peazip
 
 Name:           peazip
-Version:        9.7.1
+Version:        9.8.0
 Release:        0
 Summary:        Graphical file archiver
 License:        LGPL-3.0-only
@@ -27,9 +27,7 @@ Group:          Productivity/Archiving/Compression
 URL:            https://peazip.github.io/
 Source0:        https://github.com/peazip/PeaZip/releases/download/%{version}/peazip-%{version}.src.zip
 Source1:        altconf.txt
-# For release 9.7.1 the help was not uploaded (the same as 9.7.0 though, which is the one included here)
-#Source2:        https://github.com/peazip/PeaZip/releases/download/%{version}/peazip_help.pdf
-Source2:        peazip_help.pdf
+Source2:        https://github.com/peazip/PeaZip/releases/download/%{version}/peazip_help.pdf
 Patch0:         peazip-desktop.patch
 # PATCH-FIX-OPENSUSE peazip-build_PIE.patch -- aloisio@gmx.com
 Patch1:         peazip-build_PIE.patch
diff --git a/peazip_help.pdf b/peazip_help.pdf
index 4e80a81..9ae5088 100644
--- a/peazip_help.pdf
+++ b/peazip_help.pdf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b71d507cdbacbaec3b6609f3828cec7e244b61221b307ca1752af17a7ee473cc
-size 1366449
+oid sha256:828e1d202bcd0db61f605aa4cbc52385d3e8697c4621231758ff33d69dbe6ded
+size 1373696