diff --git a/GNUmakefile b/GNUmakefile
index 8cac498ed5..21a46c60df 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,61 +1,61 @@
 #
 # Copyright 2008-2023 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 
 default: build
 .PHONY: default
 
 -include Makefile
 
 # The main purpose of this GNUmakefile is that its targets can be invoked
 # without having to call autogen.sh and configure first. That means automake
 # variables may or may not be defined. Here, we use the current working
 # directory if a relevant variable hasn't been defined.
 abs_srcdir	?= $(shell pwd)
 
 PACKAGE		?= pacemaker
 
 .PHONY: init
 init:
 	test -e configure && test -e libltdl || ./autogen.sh
 	test -e Makefile || ./configure
 
 .PHONY: build
 build: init
 	$(MAKE) $(AM_MAKEFLAGS) core
 
 ## RPM-related targets (deprecated; use targets in rpm subdirectory instead)
 
 # Pass option depending on whether automake has been run or not
 USE_FILE = $(shell test -e rpm/Makefile || echo "-f Makefile.am")
 
-.PHONY: $(PACKAGE).spec chroot dirty export mock rc release rpm rpmlint srpm
-$(PACKAGE).spec chroot dirty export mock rc release rpm rpmlint srpm:
+.PHONY: $(PACKAGE).spec chroot dirty export mock rc release rpm srpm
+$(PACKAGE).spec chroot dirty export mock rc release rpm srpm:
 	$(MAKE) $(AM_MAKEFLAGS) -C rpm $(USE_FILE) "$@"
 
 mock-% rpm-% spec-% srpm-%: FORCE
 	$(MAKE) $(AM_MAKEFLAGS) -C rpm $(USE_FILE) "$@"
 
 ## Development-related targets
 ## (deprecated; use targets in devel subdirectory instead)
 
 COVLEVEL        	?= low
 COVERAGE_TARGETS	= coverage coverage-cts coverage-clean
 COVERITY_TARGETS	= coverity coverity-analyze coverity-clean coverity-corp
 
 .PHONY: clang $(COVERAGE_TARGETS) $(COVERITY_TARGETS) cppcheck indent
 clang $(COVERAGE_TARGETS) $(COVERITY_TARGETS) cppcheck indent:
 	@echo 'Deprecated: Use "make -C devel $@" instead'
 	$(MAKE) $(AM_MAKEFLAGS)				\
 		CLANG_checkers=$(CLANG_checkers)	\
 		COVLEVEL=$(COVLEVEL)			\
 		CPPCHECK_ARGS=$(CPPCHECK_ARGS)		\
 		-C devel "$@"
 
 .PHONY: FORCE
 FORCE:
diff --git a/rpm/Makefile.am b/rpm/Makefile.am
index 2388ad60ee..9a454e5870 100644
--- a/rpm/Makefile.am
+++ b/rpm/Makefile.am
@@ -1,294 +1,295 @@
 #
 # Copyright 2003-2023 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 
 # We want to support the use case where this file is fed straight to make
 # without running automake first, so define defaults for any automake variables
 # used in this file.
 top_srcdir              ?= ..
 abs_srcdir              ?= $(shell pwd)
 abs_builddir 	?= $(abs_srcdir)
 MAKE                    ?= make
 PACKAGE                 ?= pacemaker
 AM_V_at                 ?= @
 MKDIR_P                 ?= mkdir -p
 
 include $(top_srcdir)/mk/common.mk
 include $(top_srcdir)/mk/release.mk
 
 EXTRA_DIST		= pacemaker.spec.in	\
 			  rpmlintrc
 
 # Extra options to pass to rpmbuild (this can be used to override the location
 # options this file normally passes, or to override macros used by the spec)
 RPM_EXTRA		?=
 
 # Where to put RPM artifacts; possible values:
 #
 # - subtree (default): RPM sources (i.e. TARFILE) in top-level build directory,
 #   everything else in dedicated "rpm" subdirectory of build tree
 #
 # - toplevel (deprecated): RPM sources, spec, and source rpm in top-level build
 #   directory, everything else uses the usual rpmbuild defaults
 #
 # - anything else: The value will be treated as a directory path to be used for
 #   all RPM artifacts. WARNING: The entire directory will get removed with
 #   "make clean" or "make rpm-clean".
 #
 RPMDEST         	?= subtree
 
 RPM_SPEC_DIR_subtree	= $(abs_builddir)/SPECS
 RPM_SRCRPM_DIR_subtree	= $(abs_builddir)/SRPMS
 RPM_OPTS_subtree	= --define "_sourcedir $(abs_builddir)/.." 	\
 			  --define "_topdir $(abs_builddir)"
 RPM_CLEAN_subtree	= "$(abs_builddir)/BUILD"			\
 			  "$(abs_builddir)/BUILDROOT"			\
 			  "$(abs_builddir)/RPMS"			\
 			  "$(abs_builddir)/SPECS"			\
 			  "$(abs_builddir)/SRPMS"
 
 RPM_SPEC_DIR_toplevel	= $(abs_builddir)/..
 RPM_SRCRPM_DIR_toplevel	= $(abs_builddir)/..
 RPM_OPTS_toplevel	= --define "_sourcedir $(abs_builddir)/.." 		\
 			  --define "_specdir   $(RPM_SPEC_DIR_toplevel)"	\
 			  --define "_srcrpmdir $(RPM_SRCRPM_DIR_toplevel)"
 RPM_CLEAN_toplevel	=
 
 RPM_SPEC_DIR_other	= $(RPMDEST)/SPECS
 RPM_SRCRPM_DIR_other	= $(RPMDEST)/SRPMS
 RPM_OPTS_other		= --define "_sourcedir $(abs_builddir)/.." 	\
 			  --define "_topdir $(RPMDEST)"
 RPM_CLEAN_other		= "$(RPMDEST)"
 
 RPMTYPE		= $(shell case "$(RPMDEST)" in 			\
 			toplevel$(rparen) echo toplevel ;;	\
 			subtree$(rparen) echo subtree ;;	\
 			*$(rparen) echo other ;;		\
 			esac)
 RPM_SPEC_DIR	= $(RPM_SPEC_DIR_$(RPMTYPE))
 RPM_SRCRPM_DIR	= $(RPM_SRCRPM_DIR_$(RPMTYPE))
 RPM_OPTS	= $(RPM_OPTS_$(RPMTYPE)) $(RPM_EXTRA)
 RPM_CLEAN	= $(RPM_CLEAN_$(RPMTYPE))
 
 WITH		?= --without doc
 
 # If $(BUILD_COUNTER) is an existing file, its contents will be used as the
 # spec version in built RPMs, unless $(SPECVERSION) is set to override it,
 # and the next increment will be written back to the file after building.
 BUILD_COUNTER	?= $(shell test -e build.counter && echo build.counter || echo ../build.counter)
 
 LAST_COUNT      = $(shell test -e "$(BUILD_COUNTER)" && cat "$(BUILD_COUNTER)" || echo 0)
 COUNT           = $(shell expr 1 + $(LAST_COUNT))
 SPECVERSION	?= $(COUNT)
 
 # SPEC_COMMIT is identical to TAG for DIST and tagged releases, otherwise it is
 # the short commit ID (which must be used in order for "make export" to use the
 # same archive name as "make dist")
 SPEC_COMMIT	?= $(shell						\
 		case $(TAG) in						\
 		    Pacemaker-*|DIST$(rparen)				\
 		        echo '$(TAG)' ;;				\
 		    *$(rparen)						\
 		        "$(GIT)" log --pretty=format:%h -n 1 '$(TAG)';;	\
 		esac)$(DIRTY_EXT)
 SPEC_ABBREV	= $(shell printf %s '$(SPEC_COMMIT)' | wc -c)
 SPEC_RELEASE	= $(shell case "$(WITH)" in 				\
 		  *pre_release*$(rparen)				\
 			[ "$(LAST_RELEASE)" = "$(TAG)" ]		\
 				&& echo "$(LAST_RELEASE)"		\
 				|| echo "$(NEXT_RELEASE)" ;;		\
 		  *$(rparen)						\
 			echo "$(LAST_RELEASE)" ;;			\
 		  esac)
 SPEC_RELEASE_NO	= $(shell echo $(SPEC_RELEASE) | sed -e s:Pacemaker-:: -e s:-.*::)
 
 MOCK_DIR	= $(abs_builddir)/mock
 MOCK_OPTIONS	?= --resultdir="$(MOCK_DIR)" --no-cleanup-after
 
 F	?= $(shell test ! -e /etc/fedora-release && echo 0; test -e /etc/fedora-release && rpm --eval %{fedora})
 ARCH	?= $(shell test ! -e /etc/fedora-release && uname -m; test -e /etc/fedora-release && rpm --eval %{_arch})
 MOCK_CFG	?= $(shell test -e /etc/fedora-release && echo fedora-$(F)-$(ARCH))
 
 distdir		= $(top_distdir)/rpm
 TARFILE		= $(abs_builddir)/../$(top_distdir).tar.gz
 
 # Create a source distribution based on a git archive. (If we aren't in a git
 # checkout, do a make dist instead.)
 .PHONY: export
 export:
 	cd $(abs_srcdir)/..;							\
 	if [ -z "$(CHECKOUT)" ] && [ -f "$(TARFILE)" ]; then			\
 	    echo "`date`: Using existing tarball: $(TARFILE)";			\
 	elif [ -z "$(CHECKOUT)" ]; then						\
 	    $(MAKE) $(AM_MAKEFLAGS) dist;					\
 	    echo "`date`: Rebuilt tarball: $(TARFILE)";				\
 	elif [ -n "$(DIRTY_EXT)" ]; then					\
 	    "$(GIT)" commit -m "DO-NOT-PUSH" -a;				\
 	    "$(GIT)" archive --prefix=$(top_distdir)/ -o "$(TARFILE)"		\
 		HEAD^{tree};							\
 	    "$(GIT)" reset --mixed HEAD^;					\
 	    echo "`date`: Rebuilt $(TARFILE)";					\
 	elif [ -f "$(TARFILE)" ]; then						\
 	    echo "`date`: Using existing tarball: $(TARFILE)";			\
 	else									\
 	    "$(GIT)" archive --prefix=$(top_distdir)/ -o "$(TARFILE)"		\
 		$(TAG)^{tree};							\
 	    echo "`date`: Rebuilt $(TARFILE)";					\
 	fi
 
 # Depend on spec-clean so the spec gets rebuilt every time
 $(RPM_SPEC_DIR)/$(PACKAGE).spec: spec-clean pacemaker.spec.in
 	$(AM_V_at)$(MKDIR_P) "$(RPM_SPEC_DIR)"
 	$(AM_V_GEN)if [ x"`"$(GIT)" ls-files				\
 		-m pacemaker.spec.in 2>/dev/null`" != x ]; then		\
 	    cat "$(abs_srcdir)/pacemaker.spec.in";			\
 	elif "$(GIT)" cat-file -e $(TAG):rpm/pacemaker.spec.in		\
 		2>/dev/null; then					\
 	    "$(GIT)" show $(TAG):rpm/pacemaker.spec.in;			\
 	elif "$(GIT)" cat-file -e $(TAG):pacemaker.spec.in 2>/dev/null;	\
 		then							\
 	    "$(GIT)" show $(TAG):pacemaker.spec.in;			\
 	else 								\
 	    cat "$(abs_srcdir)/pacemaker.spec.in";			\
 	fi | sed							\
 	    -e 's/^\(%global pcmkversion \).*/\1$(SPEC_RELEASE_NO)/'	\
 	    -e 's/^\(%global specversion \).*/\1$(SPECVERSION)/' 	\
 	    -e 's/^\(%global commit \).*/\1$(SPEC_COMMIT)/'		\
 	    -e 's/^\(%global commit_abbrev \).*/\1$(SPEC_ABBREV)/'	\
 	    -e "s/PACKAGE_DATE/$$(date +'%a %b %d %Y')/"		\
 	    -e 's/PACKAGE_VERSION/$(SPEC_RELEASE_NO)-$(SPECVERSION)/'	\
-	    > "$@"
+	    > "$@"; 							\
+	if echo "$$(rpmlint --help 2>&1)" | grep -q "ignore-unused-rpmlintrc"; then 	\
+		rpmlint --ignore-unused-rpmlintrc --file rpmlintrc "$@"; 		\
+	else 										\
+		rpmlint --file rpmlintrc "$@"; 						\
+	fi
 
 .PHONY: spec $(PACKAGE).spec
 spec $(PACKAGE).spec: $(RPM_SPEC_DIR)/$(PACKAGE).spec
 
 spec-clean:
 	-rm -f "$(RPM_SPEC_DIR)/$(PACKAGE).spec"
 
 .PHONY: srpm
 srpm:	export srpm-clean $(RPM_SPEC_DIR)/$(PACKAGE).spec
 	if [ -e "$(BUILD_COUNTER)" ]; then		\
 		echo $(COUNT) > "$(BUILD_COUNTER)";	\
 	fi
 	rpmbuild -bs $(RPM_OPTS) $(WITH) "$(RPM_SPEC_DIR)/$(PACKAGE).spec"
 
 .PHONY: srpm-clean
 srpm-clean:
 	-rm -f "$(RPM_SRCRPM_DIR)"/*.src.rpm
 
 # e.g. make WITH="--with pre_release" rpm
 .PHONY: rpm
 rpm:	srpm
 	@echo To create custom builds, edit the flags and options in $(PACKAGE).spec first
 	rpmbuild $(RPM_OPTS) $(WITH) --rebuild "$(RPM_SRCRPM_DIR)"/*.src.rpm
 
 .PHONY: rpm-clean
 rpm-clean: spec-clean srpm-clean
 	-if [ -n "$(RPM_CLEAN)" ]; then rm -rf $(RPM_CLEAN); fi
 
-.PHONY: rpmlint
-rpmlint: $(RPM_SPEC_DIR)/$(PACKAGE).spec
-	rpmlint -f rpmlintrc "$<"
-
 .PHONY: rpm-dep
 rpm-dep: $(RPM_SPEC_DIR)/$(PACKAGE).spec
 	sudo yum-builddep "$(RPM_SPEC_DIR)/$(PACKAGE).spec"
 
 .PHONY: release
 release:
 	$(MAKE) $(AM_MAKEFLAGS) TAG=$(LAST_RELEASE) rpm
 
 # Build the highest-versioned rc tag
 .PHONY: rc
 rc:
 	@if [ -z "$(CHECKOUT)" ]; then					\
 		echo 'This target must be run from a git checkout';	\
 		exit 1;							\
 	fi
 	$(MAKE) $(AM_MAKEFLAGS) TAG="$$("$(GIT)" tag -l 2>/dev/null	\
 		| sed -n -e 's/^\(Pacemaker-[0-9.]*-rc[0-9]*\)$$/\1/p'	\
 		| sort -Vr | head -n 1)" rpm
 
 .PHONY: chroot
 chroot: mock-$(MOCK_CFG) mock-install-$(MOCK_CFG) mock-sh-$(MOCK_CFG)
 	@echo Done
 
 .PHONY: mock-next
 mock-next:
 	$(MAKE) $(AM_MAKEFLAGS) F=$(shell expr 1 + $(F)) mock
 
 .PHONY: mock-rawhide
 mock-rawhide:
 	$(MAKE) $(AM_MAKEFLAGS) F=rawhide mock
 
 mock-install-%:
 	@echo "Installing packages"
 	mock --root=$* $(MOCK_OPTIONS) --install "$(MOCK_DIR)"/*.rpm \
 		vi sudo valgrind lcov gdb fence-agents psmisc
 
 .PHONY: mock-install
 mock-install: mock-install-$(MOCK_CFG)
 	@echo Done
 
 .PHONY: mock-sh
 mock-sh: mock-sh-$(MOCK_CFG)
 	@echo Done
 
 mock-sh-%:
 	@echo Connecting
 	mock --root=$* $(MOCK_OPTIONS) --shell
 	@echo Done
 
 mock-%: srpm mock-clean
 	mock $(MOCK_OPTIONS) --root=$* --no-cleanup-after --rebuild	\
 		$(WITH) "$(RPM_SRCRPM_DIR)"/*.src.rpm
 
 .PHONY: mock
 mock:   mock-$(MOCK_CFG)
 	@echo Done
 
 .PHONY: dirty
 dirty:
 	$(MAKE) $(AM_MAKEFLAGS) DIRTY=yes mock
 
 .PHONY: mock-clean
 mock-clean:
 	-rm -rf "$(MOCK_DIR)"
 
 # Make debugging makefile issues easier
 .PHONY: vars
 vars:
 	@echo "CHECKOUT=$(CHECKOUT)"
 	@echo "VERSION=$(VERSION)"
 	@echo "COMMIT=$(COMMIT)"
 	@echo "TAG=$(TAG)"
 	@echo "DIRTY=$(DIRTY)"
 	@echo "DIRTY_EXT=$(DIRTY_EXT)"
 	@echo "LAST_RELEASE=$(LAST_RELEASE)"
 	@echo "NEXT_RELEASE=$(NEXT_RELEASE)"
 	@echo "top_distdir=$(top_distdir)"
 	@echo "RPMDEST=$(RPMDEST)"
 	@echo "RPMTYPE=$(RPMTYPE)"
 	@echo "RPM_SPEC_DIR=$(RPM_SPEC_DIR)"
 	@echo "RPM_SRCRPM_DIR=$(RPM_SRCRPM_DIR)"
 	@echo "RPM_OPTS=$(RPM_OPTS)"
 	@echo "RPM_CLEAN=$(RPM_CLEAN)"
 	@echo "WITH=$(WITH)"
 	@echo "BUILD_COUNTER=$(BUILD_COUNTER)"
 	@echo "LAST_COUNT=$(LAST_COUNT)"
 	@echo "COUNT=$(COUNT)"
 	@echo "SPECVERSION=$(SPECVERSION)"
 	@echo "SPEC_COMMIT=$(SPEC_COMMIT)"
 	@echo "SPEC_ABBREV=$(SPEC_ABBREV)"
 	@echo "SPEC_RELEASE=$(SPEC_RELEASE)"
 	@echo "SPEC_RELEASE_NO=$(SPEC_RELEASE_NO)"
 	@echo "TARFILE=$(TARFILE)"
 
 .PHONY: clean-local
 clean-local: mock-clean rpm-clean
 	-rm -f "$(TARFILE)"