diff --git a/archive-patches/busybox-mount_single_uuid.patch b/archive-patches/busybox-mount_single_uuid.patch
new file mode 100644
index 00000000..f2d651ca
--- /dev/null
+++ b/archive-patches/busybox-mount_single_uuid.patch
@@ -0,0 +1,11 @@
+--- a/util-linux/mount.c
++++ b/util-linux/mount.c
+@@ -2315,6 +2315,8 @@ int mount_main(int argc UNUSED_PARAM, ch
+ 		// "proc") or a full path from root
+ 		if (argv[0]) {
+ 
++			// Check for UUID= or LABEL= entries too
++			resolve_mount_spec(&mtcur->mnt_fsname);
+ 			// Is this what we're looking for?
+ 			if (strcmp(argv[0], mtcur->mnt_fsname) != 0
+ 			 && strcmp(storage_path, mtcur->mnt_fsname) != 0
diff --git a/make/system-tools.mk b/make/system-tools.mk
index b5189f5a..0a933d1f 100644
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@@ -16,6 +16,7 @@ BUSYBOX_PATCH  = busybox-fix-config-header.diff
 BUSYBOX_PATCH += busybox-insmod-hack.patch
 BUSYBOX_PATCH += busybox-mount-use-var-etc-fstab.patch
 BUSYBOX_PATCH += busybox-fix-partition-size.patch
+BUSYBOX_PATCH += busybox-mount_single_uuid.patch
 
 # Link busybox against libtirpc so that we can leverage its RPC support for NFS
 # mounting with BusyBox