diff --git a/001-reset-error-warning-flags.patch b/001-reset-error-warning-flags.patch
new file mode 100644
index 0000000..4c6c12b
--- /dev/null
+++ b/001-reset-error-warning-flags.patch
@@ -0,0 +1,26 @@
+From 78e6b46a2bbb80af24a804045313370a6404a251 Mon Sep 17 00:00:00 2001
+From: Hideo Yamauchi <renayama19661014@ybb.ne.jp>
+Date: Thu, 9 Jan 2025 08:32:48 +0900
+Subject: [PATCH] Mid: schedulerd: Resetting error and warning flags.
+
+---
+ lib/pengine/status.c | 3 +++
+ 1 file changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/lib/pengine/status.c b/lib/pengine/status.c
+index a97d6f7..87b5f6c 100644
+--- a/lib/pengine/status.c
++++ b/lib/pengine/status.c
+@@ -447,6 +447,9 @@ set_working_set_defaults(pcmk_scheduler_t *scheduler)
+                               |pcmk__sched_stop_removed_resources
+                               |pcmk__sched_cancel_removed_actions);
+ #endif
++
++    pcmk__config_has_error = false;
++    pcmk__config_has_warning = false;
+ }
+ 
+ pcmk_resource_t *
+-- 
+2.47.0
+
diff --git a/pacemaker.spec b/pacemaker.spec
index 28adfc8..4fd3832 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -41,10 +41,10 @@
 ## can be incremented to build packages reliably considered "newer"
 ## than previously built packages with the same pcmkversion)
 %global pcmkversion 3.0.0
-%global specversion 4
+%global specversion 5
 
 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
-%global commit 2587987be9f440c1f292233a8adea785f16641c5
+%global commit d8340737c46ccb265bd82c5493b58e9c14ba67e5
 
 ## Since git v2.11, the extent of abbreviation is autoscaled by default
 ## (used to be constant of 7), so we need to convey it for non-tags, too.
@@ -199,7 +199,7 @@ Url:           https://www.clusterlabs.org/
 Source0:       https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{archive_github_url}
 Source1:       pacemaker.sysusers
 # upstream commits
-#Patch001:      001-xxxx.patch
+Patch001:      001-reset-error-warning-flags.patch
 
 Requires:      resource-agents
 Requires:      %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
@@ -243,7 +243,7 @@ BuildRequires: sed
 
 # Required for core functionality
 BuildRequires: pkgconfig(glib-2.0) >= 2.42
-BuildRequires: pkgconfig(gnutls) >= 3.1.7
+BuildRequires: pkgconfig(gnutls) >= 3.4.6
 BuildRequires: pkgconfig(libxml-2.0) >= 2.9.2
 BuildRequires: pkgconfig(systemd)
 BuildRequires: libxslt-devel
@@ -602,7 +602,6 @@ exit 0
 %files
 ###########################################################
 %config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
-%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
 %{_sbindir}/pacemakerd
 %{_unitdir}/pacemaker.service
 
@@ -638,8 +637,11 @@ exit 0
 %{ocf_root}/resource.d/pacemaker/controld
 %{ocf_root}/resource.d/pacemaker/remote
 
+# The logrotate script is here rather than the main pacemaker package so
+# pacemaker-remoted can use it
 %files cli
 %dir %attr (750, root, %{gname}) %{_sysconfdir}/pacemaker
+%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
 %config(noreplace) %{_sysconfdir}/sysconfig/crm_mon
 
 %{_unitdir}/crm_mon.service
@@ -790,6 +792,13 @@ exit 0
 %{_datadir}/pkgconfig/pacemaker-schemas.pc
 
 %changelog
+* Fri Jan 10 2025 Chris Lumens <clumens@redhat.com> - 3.0.0-5
+- Rebase on upstream 3.0.0 final release
+- Raise minimum GnuTLS dependency to 3.4.6
+- Move logrotate script back to pacemaker-cli package
+- Clear warnings and errors when resetting scheduler object
+- Resolves: RHEL-61383
+
 * Thu Jan 02 2025 Chris Lumens <clumens@redhat.com> - 3.0.0-4
 - Rebase on upstream 3.0.0-rc3
 - Log warnings if XSL transforms cannot preserve previous behavior
diff --git a/sources b/sources
index 70ee64f..2484111 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pacemaker-2587987be.tar.gz) = 2f3cc2ea8459956d4d0c69eb32aed69e263004c44bf73bbd37e63c542e318e300816bfcd6121500ac25980163936b8cc38293171e6d250bf1d34910ae62320d6
+SHA512 (pacemaker-d8340737c.tar.gz) = d91c7aa0cd5c607061e43b9b9403cfa806b86eb2730187e701a40c2b245ce8fbf34361af7a5ac9a4985b34f0dbdc6436815dcba5b6b177a7d058692599bd46ec