diff --git a/mxmount b/mxmount
index 125c00c..6f0cb8f 100755
--- a/mxmount
+++ b/mxmount
@@ -136,8 +136,11 @@ sub parse_data {
            if($D->{label} =~ /^X/) {
                $D->{mountpoint} = 'X/' . $D->{label};
                $D->{label} = lc($D->{label});
+           } elsif($D->{label} =~ /^data(.*)/) {
+               $D->{mountpoint} = $1;
            } else {
-               $D->{mountpoint} = $D->{label};
+               warn "mxmount: unknown shortlabel '$D->{label}'.. skipping..";
+               next;
            }
        }
        if($D->{mountpoint} !~ m(^\/)) {