diff --git a/.gitignore b/.gitignore
index 2d849e2..50ba71c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
 /grass-7.8.4.tar.gz
 /grass-7.8.5.tar.gz
 /grass-7.8.6.tar.gz
+/grass-7.8.7.tar.gz
+/grass-7.8.8.tar.gz
diff --git a/grass.spec b/grass.spec
index ec84f53..225b8da 100644
--- a/grass.spec
+++ b/grass.spec
@@ -2,8 +2,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:		grass
-Version:	7.8.6
-Release:	2%{?dist}
+Version:	7.8.8
+Release:	1%{?dist}
 Summary:	GRASS GIS - Geographic Resources Analysis Support System
 
 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
@@ -20,7 +20,7 @@ Summary:	GRASS GIS - Geographic Resources Analysis Support System
 # "%%bcond_without" means "ENABLE by default and create a --without option"
 %bcond_without python3
 
-License:	GPLv2+
+License:	GPL-2.0-or-later
 URL:		https://grass.osgeo.org
 Source0:	https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz
 
@@ -193,6 +193,7 @@ find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},'
 CFLAGS="$(echo ${RPM_OPT_FLAGS} | sed -e 's/ -Werror=format-security//')"
 CXXFLAGS="-std=c++98 ${CFLAGS}"
 %configure \
+	--prefix=%{_libdir} \
 	--with-cxx \
 	--with-tiff \
 	--with-png \
@@ -239,6 +240,9 @@ CXXFLAGS="-std=c++98 ${CFLAGS}"
 	--with-zstd \
 	--with-proj-share=%{_datadir}/proj
 
+# .package_note hack for RHBZ #2084342 and RHBZ #2102895
+sed -i "s+ -Wl,-dT,${RPM_BUILD_DIR}/grass-%{version}/.package_note-grass-%{version}-%{release}.%{_arch}.ld++g" include/Make/Platform.make
+
 make %{?_smp_mflags}
 
 # by default, grass will be installed to /usr/grass-%%{version}
@@ -359,13 +363,19 @@ fi
 %{_libdir}/%{name}%{shortver}/gui
 
 %files devel
-%doc TODO doc/* SUBMITTING
+%doc TODO doc/* CONTRIBUTING.md
 %{macrosdir}/macros.%{name}
 %{_libdir}/pkgconfig/*
 %dir %{_libdir}/%{name}%{shortver}/lib
 %{_libdir}/%{name}%{shortver}/include
 
 %changelog
+* Sun Aug 06 2023 Markus Neteler <neteler@mundialis.de> - 7.8.8-1
+- New upstream version GRASS GIS 7.8.8
+
+* Wed Feb 23 2022 Markus Neteler <neteler@mundialis.de> - 7.8.7-1
+- New upstream version GRASS GIS 7.8.7
+
 * Sun Nov 07 2021 Björn Esser <besser82@fedoraproject.org> - 7.8.6-2
 - Add patch to fix installation path in pkgconfig file
 
@@ -405,16 +415,16 @@ fi
 * Tue Dec 22 2020 Markus Neteler <neteler@mundialis.de> - 7.8.5-1
 - New upstream version GRASS GIS 7.8.5
 
-* Tue Nov 24 20:59:37 CET 2020 Markus Neteler <neteler@mundialis.de> - 7.8.4-6
+* Tue Nov 24 2020 Markus Neteler <neteler@mundialis.de> - 7.8.4-6
 - Clean up proj-datumgrid requires < f34+
 
-* Fri Nov 20 15:59:37 CET 2020 Sandro Mani <manisandro@gmail.com> - 7.8.4-5
+* Fri Nov 20 2020 Sandro Mani <manisandro@gmail.com> - 7.8.4-5
 - Drop proj-datumgrid requires on f34+
 
-* Fri Nov  6 22:26:41 CET 2020 Sandro Mani <manisandro@gmail.com> - 7.8.4-4
+* Fri Nov  6 2020 Sandro Mani <manisandro@gmail.com> - 7.8.4-4
 - Rebuild (proj, gdal)
 
-* Wed Nov  4 18:22:40 CET 2020 Sandro Mani <manisandro@gmail.com> - 7.8.4-3
+* Wed Nov  4 2020 Sandro Mani <manisandro@gmail.com> - 7.8.4-3
 - Rebuild (PDAL)
 
 * Sat Oct 17 2020 Markus Neteler <neteler@mundialis.de> - 7.8.4-2
diff --git a/sources b/sources
index 9d7b11b..2dd3a31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (grass-7.8.6.tar.gz) = 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
+SHA512 (grass-7.8.8.tar.gz) = 63aba6e4efe82da1ad242b2db96e961304c973cba9567ede1e0f1ea480275229be61b54ff9e493b8282f53002f581d4b28caa5340c6a6c61b4831231be6469fa