diff --git a/bz2049414-Filesystem-1-fix-uuid-label-device-whitespace.patch b/bz2049414-Filesystem-1-fix-uuid-label-device-whitespace.patch
new file mode 100644
index 0000000..09960f0
--- /dev/null
+++ b/bz2049414-Filesystem-1-fix-uuid-label-device-whitespace.patch
@@ -0,0 +1,44 @@
+From 26de0ad2f0f975166fe79ef72ab08e2c03519eea Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Mon, 28 Mar 2022 13:25:35 +0200
+Subject: [PATCH] Filesystem: fix logic for UUID/label devices with space
+ between parameter and UUID/label
+
+---
+ heartbeat/Filesystem | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
+index 1a90d6a42..72a1b8623 100755
+--- a/heartbeat/Filesystem
++++ b/heartbeat/Filesystem
+@@ -596,11 +596,11 @@ Filesystem_start()
+ 	flushbufs "$DEVICE"
+ 	# Mount the filesystem.
+ 	case "$FSTYPE" in
+-		none) $MOUNT $options "$DEVICE" "$MOUNTPOINT" &&
++		none) $MOUNT $options $device_opt "$DEVICE" "$MOUNTPOINT" &&
+ 			bind_mount
+ 			;;
+-		"") $MOUNT $options "$DEVICE" "$MOUNTPOINT" ;;
+-		*) $MOUNT -t "$FSTYPE" $options "$DEVICE" "$MOUNTPOINT" ;;
++		"") $MOUNT $options $device_opt "$DEVICE" "$MOUNTPOINT" ;;
++		*) $MOUNT -t "$FSTYPE" $options $device_opt "$DEVICE" "$MOUNTPOINT" ;;
+ 	esac
+ 
+ 	if [ $? -ne 0 ]; then
+@@ -902,7 +902,13 @@ set_blockdevice_var() {
+ 	fi
+ 
+ 	case "$DEVICE" in
+-	-*) # Oh... An option to mount instead...  Typically -U or -L
++	--*) # Typically --uuid or --label
++		device_opt=$(echo $DEVICE | sed -E "s/([[:blank:]]|=).*//")
++		DEVICE=$(echo $DEVICE | sed -E "s/$device_opt([[:blank:]]*|=)//")
++		;;
++	-*)  # Oh... An option to mount instead...  Typically -U or -L
++		device_opt=$(echo $DEVICE | cut -c1-2)
++		DEVICE=$(echo $DEVICE | sed "s/$device_opt[[:blank:]]*//")
+ 		;;
+ 	/dev/null) # Special case for BSC
+ 		blockdevice=yes
diff --git a/bz2049414-Filesystem-2-improve-uuid-label-device-logic.patch b/bz2049414-Filesystem-2-improve-uuid-label-device-logic.patch
new file mode 100644
index 0000000..844772a
--- /dev/null
+++ b/bz2049414-Filesystem-2-improve-uuid-label-device-logic.patch
@@ -0,0 +1,38 @@
+From d9b46474fc19d9c57e2cfb752d60319017da8410 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Wed, 6 Apr 2022 14:14:19 +0200
+Subject: [PATCH] Filesystem: improve logic for UUID/label and add note that
+ /dev/disk/by-{uuid,label}/ are preferred on Linux
+
+---
+ heartbeat/Filesystem | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
+index 72a1b8623..44270ad98 100755
+--- a/heartbeat/Filesystem
++++ b/heartbeat/Filesystem
+@@ -163,6 +163,8 @@ directory where the status file is to be placed.
+ <parameter name="device" required="1">
+ <longdesc lang="en">
+ The name of block device for the filesystem, or -U, -L options for mount, or NFS mount specification.
++
++NOTE: On Linux /dev/disk/by-{uuid,label}/ are preferred to -U/-L.
+ </longdesc>
+ <shortdesc lang="en">block device</shortdesc>
+ <content type="string" default="${OCF_RESKEY_device_default}" />
+@@ -902,11 +904,11 @@ set_blockdevice_var() {
+ 	fi
+ 
+ 	case "$DEVICE" in
+-	--*) # Typically --uuid or --label
+-		device_opt=$(echo $DEVICE | sed -E "s/([[:blank:]]|=).*//")
++	--uuid=*|--uuid\ *|--label=*|--label\ *)
++		device_opt=$(echo $DEVICE | sed "s/\([[:blank:]]\|=\).*//")
+ 		DEVICE=$(echo $DEVICE | sed -E "s/$device_opt([[:blank:]]*|=)//")
+ 		;;
+-	-*)  # Oh... An option to mount instead...  Typically -U or -L
++	-U*|-L*)  # short versions of --uuid/--label
+ 		device_opt=$(echo $DEVICE | cut -c1-2)
+ 		DEVICE=$(echo $DEVICE | sed "s/$device_opt[[:blank:]]*//")
+ 		;;
diff --git a/resource-agents.spec b/resource-agents.spec
index 1392a6c..a033895 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -66,7 +66,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.9.0
-Release:	18%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	19%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -103,6 +103,8 @@ Patch16:	bz2064342-3-IPsrcaddr-fix-indentation.patch
 Patch17:	bz2064342-4-IPsrcaddr-fixes.patch
 Patch18:	bz1908146-bz1908147-bz1908148-bz1949114-update-openstack-agents.patch
 Patch19:	bz2072043-LVM-activate-fix-fence-issue.patch
+Patch20:	bz2049414-Filesystem-1-fix-uuid-label-device-whitespace.patch
+Patch21:	bz2049414-Filesystem-2-improve-uuid-label-device-logic.patch
 
 # bundle patches
 Patch1000:	7-gcp-bundled.patch
@@ -296,6 +298,8 @@ exit 1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 chmod 755 heartbeat/nova-compute-wait
 chmod 755 heartbeat/NovaEvacuate
@@ -868,6 +872,12 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Thu Apr 21 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-19
+- Filesystem: fix UUID/label device support when there's whitespace
+  between parameter and UUID/label
+
+  Resolves: rhbz#2049414
+
 * Thu Apr  7 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-18
 - LVM-activate: use correct return code to fence failed node