diff --git a/grass.spec b/grass.spec
index 9365717..a62b93b 100644
--- a/grass.spec
+++ b/grass.spec
@@ -3,7 +3,7 @@
 
 Name:		grass
 Version:	8.2.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	GRASS GIS - Geographic Resources Analysis Support System
 
 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
@@ -20,6 +20,10 @@ Summary:	GRASS GIS - Geographic Resources Analysis Support System
 # "%%bcond_without" means "ENABLE by default and create a --without option"
 %bcond_without python3
 
+# GRASS GIS addon reuses the compiler flags originating from rpmbuild environment,
+# hence disabling package-notes plugin
+%undefine _package_note_file
+
 License:	GPLv2+
 URL:		https://grass.osgeo.org
 Source0:	https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz
@@ -369,6 +373,9 @@ fi
 %{_libdir}/%{name}%{shortver}/include
 
 %changelog
+* Thu Nov 03 2022 Markus Neteler <neteler@mundialis.de> - 8.2.0-6
+- fix RPM ARCH not defined for GRASS GIS addon installation (RHBZ #2138373)
+
 * Sat Sep 17 2022 Markus Neteler <neteler@mundialis.de> - 8.2.0-5
 - fix unexpected keyword argument 'codeset' (Python 3.11) for RHBZ #2126608