diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,4 +1,3 @@
-libGrantlee_Templates.so.5
 libQt5Bluetooth.so.5
 libQt5Core.so.5
 libQt5Gui.so.5
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
 name       : subsurface
-version    : 4.9.3
-release    : 5
+version    : 4.9.9
+release    : 6
 source     :
-    - https://github.com/Subsurface-divelog/subsurface/archive/v4.9.3.tar.gz : 998d4f498eb1d2b4ce34162bbe61c9913676ff590f3efaf6e12bbe50422c0fe3
+    - https://github.com/Subsurface-divelog/subsurface/archive/v4.9.9.tar.gz : 06f74e4d5c9c38a7a12c1ef2a2fdd1cccb48e4d5c0e2b823db7763bf761e67ce
 license    : GPL-2.0-or-later
 component  : office
 summary    : An open source divelog program for recreational, tech, and free-divers
@@ -14,6 +14,7 @@
     - pkgconfig(Qt5Svg)
     - pkgconfig(Qt5UiTools)
     - pkgconfig(Qt5WebKit)
+    - pkgconfig(bluez)
     - pkgconfig(libcurl)
     - pkgconfig(libgit2)
     - pkgconfig(libssh2)
@@ -22,7 +23,6 @@
     - pkgconfig(libxslt)
     - pkgconfig(libzip)
     - pkgconfig(sqlite3)
-    - grantlee-devel
     - subsurface-libdc-devel
 setup      : |
     %cmake -B build \
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>subsurface</Name>
         <Packager>
-            <Name>Joshua Strobl</Name>
-            <Email>joshua@streambits.io</Email>
+            <Name>Thomas Staudinger</Name>
+            <Email>Staudi.Kaos@gmail.com</Email>
         </Packager>
         <License>GPL-2.0-or-later</License>
         <PartOf>office</PartOf>
@@ -29,8 +29,8 @@
             <Path fileType="data">/usr/share/subsurface/Documentation/images/APD.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/APDComputer.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/APD_CSVimportF22.jpg</Path>
-            <Path fileType="data">/usr/share/subsurface/Documentation/images/AddDive1_f22.jpg</Path>
-            <Path fileType="data">/usr/share/subsurface/Documentation/images/AddDive3_f22.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/AddDive1.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/AddDive3.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/BlueEditBar_f22.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/Bookmarks.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/CCR_b1.jpg</Path>
@@ -53,7 +53,7 @@
             <Path fileType="data">/usr/share/subsurface/Documentation/images/DC_gas-dialogue1_f20.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/DC_gas-dialogue2_f20.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/DC_import_Bluetooth.jpg</Path>
-            <Path fileType="data">/usr/share/subsurface/Documentation/images/DC_import_Bluetooth_Windows.png</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/DC_import_Bluetooth_Windows.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/DC_import_f20.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/DiveListOptions.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/DiveModeChange.jpg</Path>
@@ -69,8 +69,13 @@
             <Path fileType="data">/usr/share/subsurface/Documentation/images/DownloadGPS.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/Export_f20.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/ExtraDataTab_f20.jpg</Path>
-            <Path fileType="data">/usr/share/subsurface/Documentation/images/FilterOptions.jpg</Path>
-            <Path fileType="data">/usr/share/subsurface/Documentation/images/FilterPanel.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Filter:LocTemp.png</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Filter:LocTempWeek.png</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Filter:LocTempWeekVis.png</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/FilterAND.png</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/FilterConstraints.png</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/FilterFullText.png</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/FilterOR.png</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/FilterWindowBar.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/FindMovedImages1.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/GasPressureBarGraph.jpg</Path>
@@ -82,6 +87,7 @@
             <Path fileType="data">/usr/share/subsurface/Documentation/images/Import1_f20.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/Import_csv.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/InfoBox2.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Infotab.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/LOffice_field_options.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/LOffice_save_as_options.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/LOffice_spreadsheetdata.jpg</Path>
@@ -108,13 +114,18 @@
             <Path fileType="data">/usr/share/subsurface/Documentation/images/Planner_OC_rec1.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/Planner_OC_rec2.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/Planner_pSCR.jpg</Path>
-            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref1.jpg</Path>
-            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref1_f23.jpg</Path>
-            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref2_f23.jpg</Path>
-            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref3_f23.jpg</Path>
-            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref4_f23.jpg</Path>
-            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref5_f23.jpg</Path>
-            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref7_f23.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref_cloud.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref_display.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref_downld.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref_eqpmnt.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref_georef.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref_lang.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref_log.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref_media.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref_network.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref_reset.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref_tech.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/Pref_units.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/Print1_f22.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/Print_flow_layout_f22.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/Print_print_f22.jpg</Path>
@@ -138,6 +149,7 @@
             <Path fileType="data">/usr/share/subsurface/Documentation/images/csv_import1_f20.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/csv_import2_f20.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/dc_management.jpg</Path>
+            <Path fileType="data">/usr/share/subsurface/Documentation/images/gpx_read.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/halcyon_RB80.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/icons/EAD.jpg</Path>
             <Path fileType="data">/usr/share/subsurface/Documentation/images/icons/GFLow.jpg</Path>
@@ -249,12 +261,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="5">
-            <Date>2020-06-18</Date>
-            <Version>4.9.3</Version>
+        <Update release="6">
+            <Date>2020-11-18</Date>
+            <Version>4.9.9</Version>
             <Comment>Packaging update</Comment>
-            <Name>Joshua Strobl</Name>
-            <Email>joshua@streambits.io</Email>
+            <Name>Thomas Staudinger</Name>
+            <Email>Staudi.Kaos@gmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file