diff --git a/Makefile b/Makefile
index 6fcdf3c..acd932c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,26 @@
-all: grafana-$(VER).tar.gz \
-	 grafana-vendor-$(VER).tar.xz \
-	 grafana-webpack-$(VER).tar.gz
-
-grafana-$(VER).tar.gz:
-	wget https://github.com/grafana/grafana/archive/v$(VER)/grafana-$(VER).tar.gz
+ifndef VER
+  $(error VER is undefined)
+endif
+ifndef REL
+  $(error REL is undefined)
+endif
+
+NAME       := grafana
+RPM_NAME   := $(NAME)
+SOURCE_DIR := $(NAME)-$(VER)
+SOURCE_TAR := $(NAME)-$(VER).tar.gz
+VENDOR_TAR := $(RPM_NAME)-vendor-$(VER)-$(REL).tar.xz
+WEBPACK_TAR := $(RPM_NAME)-webpack-$(VER)-$(REL).tar.gz
 
 ALL_PATCHES := $(wildcard *.patch)
 PATCHES_TO_APPLY := $(filter-out 009-patch-unused-backend-crypto.patch 010-fips.patch,$(ALL_PATCHES))
 
-grafana-vendor-$(VER).tar.xz: grafana-$(VER).tar.gz
+all: $(SOURCE_TAR) $(VENDOR_TAR) $(WEBPACK_TAR)
+
+$(SOURCE_TAR):
+	spectool -g $(RPM_NAME).spec
+
+$(VENDOR_TAR): $(SOURCE_TAR)
 	rm -rf grafana-$(VER)
 	tar xfz grafana-$(VER).tar.gz
 
@@ -31,6 +43,7 @@ grafana-vendor-$(VER).tar.xz: grafana-$(VER).tar.gz
 	cd grafana-$(VER) && yarn install --pure-lockfile
 	# Remove files with licensing issues
 	find grafana-$(VER) -type d -name 'node-notifier' -prune -exec rm -r {} \;
+	find grafana-$(VER) -type d -name 'property-information' -prune -exec rm -r {} \;
 	find grafana-$(VER) -type f -name '*.exe' -delete
 	rm -r grafana-$(VER)/node_modules/visjs-network/examples
 	./list_bundled_nodejs_packages.py grafana-$(VER)/ >> $@.manifest
@@ -40,11 +53,11 @@ grafana-vendor-$(VER).tar.xz: grafana-$(VER).tar.gz
 		grafana-$(VER)/vendor \
 		$$(find grafana-$(VER) -type d -name "node_modules" -prune)
 
-grafana-webpack-$(VER).tar.gz: grafana-vendor-$(VER).tar.xz
+$(WEBPACK_TAR): $(VENDOR_TAR)
 	cd grafana-$(VER) && \
 		../build_frontend.sh
 
 	tar cfz $@ grafana-$(VER)/public/build grafana-$(VER)/public/views grafana-$(VER)/plugins-bundled
 
 clean:
-	rm -rf *.tar.gz *.tar.xz *.manifest *.rpm grafana-*/
+	rm -rf *.tar.gz *.tar.xz *.manifest *.rpm $(NAME)-*/
diff --git a/README.md b/README.md
index a252898..0dc6a50 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,10 @@
 The grafana package
 
 ## Upgrade instructions
-(replace X.Y.Z with the new Grafana version)
+(replace X.Y.Z and R with the new Grafana version)
 
 * update `Version`, `Release` and `%changelog` in the specfile
-* create bundles and manifest: `VER=X.Y.Z make clean all`
+* create bundles and manifest: `VER=X.Y.Z REL=R make clean all`
 * update specfile with contents of the `.manifest` file
 * check if the default configuration has changed: `diff grafana-X.Y.Z/conf/defaults.ini distro-defaults.ini` and update `distro-defaults.ini` if necessary
 * update the manpages patch in `002-manpages.patch` and other patches if required
diff --git a/grafana.spec b/grafana.spec
index 6cc3194..d52c472 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -20,7 +20,7 @@ end}
 
 Name:             grafana
 Version:          7.5.9
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Metrics dashboard and graph editor
 License:          ASL 2.0
 URL:              https://grafana.org
@@ -29,11 +29,11 @@ URL:              https://grafana.org
 Source0:          https://github.com/grafana/grafana/archive/v%{version}/%{name}-%{version}.tar.gz
 
 # Source1 contains the bundled Go and Node.js dependencies
-Source1:          grafana-vendor-%{version}.tar.xz
+Source1:          grafana-vendor-%{version}-2.tar.xz
 
 %if %{compile_frontend} == 0
 # Source2 contains the precompiled frontend
-Source2:          grafana-webpack-%{version}.tar.gz
+Source2:          grafana-webpack-%{version}-2.tar.gz
 %endif
 
 # Source3 contains Grafana configuration defaults for distributions
@@ -73,11 +73,9 @@ Patch8:           008-remove-unused-frontend-crypto.patch
 # This patch removes all references to the deleted files.
 Patch9:           009-patch-unused-backend-crypto.patch
 
-%if %{enable_fips_mode}
 # This patch modifies the x/crypto/pbkdf2 function to use OpenSSL
 # if FIPS mode is enabled.
 Patch10:          010-fips.patch
-%endif
 
 # Intersection of go_arches and nodejs_arches
 ExclusiveArch:    %{grafana_arches}
@@ -704,6 +702,10 @@ GOLANG_FIPS=1 go test -v ./pkg/util -run TestEncryption
 
 
 %changelog
+* Thu Jul 08 2021 Andreas Gerstmayr <agerstmayr@redhat.com> 7.5.9-2
+- remove unused dependency property-information
+- always include FIPS patch in SRPM
+
 * Fri Jun 25 2021 Andreas Gerstmayr <agerstmayr@redhat.com> 7.5.9-1
 - update to 7.5.9 tagged upstream community sources, see CHANGELOG
 
diff --git a/sources b/sources
index 75b26de..7fc6d99 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (grafana-7.5.9.tar.gz) = f90f551e016673449e2c8c1df310ee2caa69220883be4ed1e8d5e7a42dcb9665d33cacc211ec6adf3c97f8a545ce49324827ab8d65e79f1147be73b1ea71ef1b
-SHA512 (grafana-webpack-7.5.9.tar.gz) = 62231d4a682be5fa834137e67e67cb1856022645845f67764f179072a69dcc7320a56f6e964643e4bcedc4922feec881267221123fb9eaf14cb16b2aeb3e3174
-SHA512 (grafana-vendor-7.5.9.tar.xz) = 87f25615c51bd5c3e33f686cf812ce787c4de0cd57406a27ed103b2f4e6a7dcf288e375a0cbabc24d760d1c8bcd42b0efaff3d67b1f37196c5a63649c7c33158
+SHA512 (grafana-webpack-7.5.9-2.tar.gz) = 79b73fe7b4362eaa9a5c451b3a01904fe29b998220c4d11cf563af797289c3ac721073d7245a87f27c7c375f00dbd09b82a293a808b6ca5774ceb0ce4fbe2b86
+SHA512 (grafana-vendor-7.5.9-2.tar.xz) = a505e9c428979f03892f8055fc982b5af80cd04cf57d380995526a261aa23a639e0d9a65dd52c89248a98260ae6fca5b4a0d8ac4fbc08bf88dffbb8c90f4116e