diff --git a/helpers/makefstab b/helpers/makefstab
index 8859a6a..9b7a965 100755
--- a/helpers/makefstab
+++ b/helpers/makefstab
@@ -162,5 +162,12 @@ for my $file (@files) {
     if ( $unitname eq "system_root" ) {
       write_unit($outputdir, "system", $secontext, "bind", "none", "/system_root/system", "/system", $file, $_);
     }
+
+    # In case of a legacy partition layout without a dedicated /vendor partition,
+    # bind mount /system/vendor to /vendor to make sure everything is in the proper place.
+    if ( $unitname eq "system" ) {
+      write_unit($outputdir, "vendor", $secontext, "bind", "none", "/system/vendor", "/vendor", $file, $_);
+    }
+
   }
 }