diff --git a/rasdaemon.changes b/rasdaemon.changes
index f3935b3..28b4344 100644
--- a/rasdaemon.changes
+++ b/rasdaemon.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jul  7 14:11:39 UTC 2026 - Thomas Renninger <trenn@suse.de>
+
+- - Create debugfs dependency in unit section of rasdaemon.service
+  bsc#1270438
+A debugfs_service_dependency.patch
+- On systems where no DIMMs are installed and the systems only have HBM memory,
+  the ras-mc-ctl --register-labels and --print-labels return an error instead
+  of an info message (bsc#1240542)
+A rasdaemon_ras-mc-ctl_change_no_dimm_label_message_to_info_from_error.patch
+
 -------------------------------------------------------------------
 Fri Jul 03 07:57:12 UTC 2026 - Thomas Renninger <trenn@suse.com>
 
diff --git a/rasdaemon.spec b/rasdaemon.spec
index 0eb9414..bcfffbf 100644
--- a/rasdaemon.spec
+++ b/rasdaemon.spec
@@ -24,6 +24,10 @@ License:        GPL-2.0-only
 Group:          Hardware/Other
 URL:            http://git.infradead.org/users/mchehab/rasdaemon.git
 Source:         %{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM -- based on https://github.com/mchehab/rasdaemon/pull/213
+Patch0:         rasdaemon_ras-mc-ctl_change_no_dimm_label_message_to_info_from_error.patch
+# PATCH-FIX-UPSTREAM -- based on https://github.com/mchehab/rasdaemon/pull/253
+Patch1:         debugfs_service_dependency.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gettext-devel
@@ -51,7 +55,7 @@ EDAC drivers and DIMM labels are loaded at system startup, as well as
 an utility for reporting current error counts from the EDAC sysfs files.
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
 # Fixes:
diff --git a/debugfs_service_dependency.patch b/debugfs_service_dependency.patch
new file mode 100644
index 0000000..d2be41f
--- /dev/null
+++ b/debugfs_service_dependency.patch
@@ -0,0 +1,15 @@
+---
+ misc/rasdaemon.service.in |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/misc/rasdaemon.service.in
++++ b/misc/rasdaemon.service.in
+@@ -4,6 +4,8 @@
+ Description=RAS daemon to log the RAS events
+ # only needed when not running in foreground (--foreground | -f)
+ #After=syslog.target
++After=sys-kernel-debug.mount
++Wants=sys-kernel-debug.mount
+ 
+ [Service]
+ EnvironmentFile=@SYSCONFDEFDIR@/rasdaemon
diff --git a/rasdaemon_ras-mc-ctl_change_no_dimm_label_message_to_info_from_error.patch b/rasdaemon_ras-mc-ctl_change_no_dimm_label_message_to_info_from_error.patch
new file mode 100644
index 0000000..a6127a6
--- /dev/null
+++ b/rasdaemon_ras-mc-ctl_change_no_dimm_label_message_to_info_from_error.patch
@@ -0,0 +1,36 @@
+From 676ad1abaacae548cf07734756a0db7846598e5b Mon Sep 17 00:00:00 2001
+From: Thomas Abraham <tabraham@suse.com>
+Date: Thu, 24 Apr 2025 10:06:15 -0400
+Subject: [PATCH] rasdaemon: ras-mc-ctl: change no dimm label message to info
+ from error
+
+The lack of DIMM labels is not necessarily an error, such as on
+systems with of HBM memory. So, these messages should not be errors.
+---
+ util/ras-mc-ctl.in |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -776,8 +776,8 @@
+     my $format = "%-35s %-20s %-20s\n";
+ 
+     if (!exists $$lref{$vendor}{$model} && !exists $$lref_prod{$pvendor}{$pname}) {
+-	log_error ("No dimm labels for $conf{mainboard}{vendor} " .
+-		   "model $conf{mainboard}{model}\n");
++	print "No dimm labels for $conf{mainboard}{vendor} " .
++		   "model $conf{mainboard}{model}\n" unless $conf{opt}{quiet};
+ 	return;
+     }
+ 
+@@ -833,8 +833,8 @@
+     my $sysfs  = "/sys/devices/system/edac/mc";
+ 
+     if (!exists $$lref{$vendor}{$model} && !exists $$lref_prod{$pvendor}{$pname}) {
+-	log_error ("No dimm labels for $conf{mainboard}{vendor} " .
+-				      "model $conf{mainboard}{model}\n");
++	print "No dimm labels for $conf{mainboard}{vendor} " .
++				      "model $conf{mainboard}{model}\n" unless $conf{opt}{quiet};
+ 	return 0;
+     }
+     my $sysfs_dir = "/sys/devices/system/edac/mc";