diff --git a/s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch b/s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch
new file mode 100644
index 0000000..84f5fae
--- /dev/null
+++ b/s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch
@@ -0,0 +1,19 @@
+---
+ ziomon/ziorep_config |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/ziomon/ziorep_config
++++ b/ziomon/ziorep_config
+@@ -123,11 +123,11 @@ sub get_device_data
+ 			} else {
+ 				$devices{$hctl}{dev}  = glob_last("block\:sd*");
+ 			}
++			$devices{$hctl}{sg_mm}   = get_line("generic", "dev");
+ 			$c_src = $devices{$hctl}{dev};
+ 			$devices{$hctl}{dev}  =~ s/.*(sd[a-z0-9]+)\Z/$1/
+ 						unless(!$devices{$hctl}{dev});
+ 			$devices{$hctl}{mm}   = get_line("dev");
+-			$devices{$hctl}{sg_mm}   = get_line("generic", "dev");
+ 			$devices{$hctl}{mp_dev} = glob_last("holders", "dm*");
+ 			$devices{$hctl}{mp_dev} =~ s/.*\/(.+)\Z/$1/
+ 						unless (!$devices{$hctl}{mp_dev});
diff --git a/s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch b/s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch
new file mode 100644
index 0000000..c12314a
--- /dev/null
+++ b/s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch
@@ -0,0 +1,14 @@
+---
+ ziomon/ziorep_config |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/ziomon/ziorep_config
++++ b/ziomon/ziorep_config
+@@ -124,6 +124,7 @@ sub get_device_data
+ 				$devices{$hctl}{dev}  = glob_last("block\:sd*");
+ 			}
+ 			$devices{$hctl}{sg_mm}   = get_line("generic", "dev");
++			next if !defined $devices{$hctl}{dev};
+ 			$c_src = $devices{$hctl}{dev};
+ 			$devices{$hctl}{dev}  =~ s/.*(sd[a-z0-9]+)\Z/$1/
+ 						unless(!$devices{$hctl}{dev});
diff --git a/s390-tools.changes b/s390-tools.changes
index 11c8288..bca2de2 100644
--- a/s390-tools.changes
+++ b/s390-tools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu May  4 08:32:36 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+-  Applied patches for ziomon: fix for SCSI devices of type disk without block dev
+    (bsc#1211008)
+  * s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch
+  * s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch
+
 -------------------------------------------------------------------
 Tue May  2 11:40:12 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
 
diff --git a/s390-tools.spec b/s390-tools.spec
index d2e1b89..a51a157 100644
--- a/s390-tools.spec
+++ b/s390-tools.spec
@@ -171,6 +171,10 @@ Patch926:       s390-tools-sles15sp5-15-zipl-Embed-loader-data-directly-into-boo
 Patch927:       s390-tools-sles15sp5-lszcrypt-use-separate-index-for-inner-sub-device-loo.patch
 #
 Patch928:       s390-tools-ALP-zdev-live.patch
+# Bug 1211008
+Patch929:       s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch
+Patch930:       s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch
+
 #
 Patch999:       s390-tools-sles15sp5-fix-chown-commands-syntax.patch