diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c
index c504ce8fee..6742b7c755 100644
--- a/src/shared/mount-util.c
+++ b/src/shared/mount-util.c
@@ -765,7 +765,9 @@ int mount_option_mangle(
                 }
 
                 /* If 'word' is not a mount flag, then store it in '*ret_remaining_options'. */
-                if (!ent->name && !strextend_with_separator(&ret, ",", word))
+                if (!ent->name &&
+                    !startswith_no_case(word, "x-") &&
+                    !strextend_with_separator(&ret, ",", word))
                         return -ENOMEM;
         }