diff --git a/fixup-mountpoints b/fixup-mountpoints
index 0eee63c..dc2fd39 100755
--- a/fixup-mountpoints
+++ b/fixup-mountpoints
@@ -1112,6 +1112,64 @@ case "$DEVICE" in
             -e 's block/bootdevice/by-name/oem mmcblk0p30 ' \
             "$@"
         ;;
+      "montana")
+        sed -i \
+            -e 's block/bootdevice/by-name/sbl1 mmcblk0p1 ' \
+            -e 's block/bootdevice/by-name/rpm mmcblk0p2 ' \
+            -e 's block/bootdevice/by-name/tz mmcblk0p3 ' \
+            -e 's block/bootdevice/by-name/devcfg mmcblk0p4 ' \
+            -e 's block/bootdevice/by-name/aboot mmcblk0p5 ' \
+            -e 's block/bootdevice/by-name/cmnlib mmcblk0p6 ' \
+            -e 's block/bootdevice/by-name/cmnlib64 mmcblk0p7 ' \
+            -e 's block/bootdevice/by-name/keymaster mmcblk0p8 ' \
+            -e 's block/bootdevice/by-name/prov mmcblk0p9 ' \
+            -e 's block/bootdevice/by-name/sbl1bak mmcblk0p10 ' \
+            -e 's block/bootdevice/by-name/rpmbak mmcblk0p11 ' \
+            -e 's block/bootdevice/by-name/tzbak mmcblk0p12 ' \
+            -e 's block/bootdevice/by-name/devcfgbak mmcblk0p13 ' \
+            -e 's block/bootdevice/by-name/abootbak mmcblk0p14 ' \
+            -e 's block/bootdevice/by-name/cmnlibbak mmcblk0p15 ' \
+            -e 's block/bootdevice/by-name/cmnlib64bak mmcblk0p16 ' \
+            -e 's block/bootdevice/by-name/keymasterbak mmcblk0p17 ' \
+            -e 's block/bootdevice/by-name/provbak mmcblk0p18 ' \
+            -e 's block/bootdevice/by-name/modem mmcblk0p19 ' \
+            -e 's block/bootdevice/by-name/fsc mmcblk0p20 ' \
+            -e 's block/bootdevice/by-name/ssd mmcblk0p21 ' \
+            -e 's block/bootdevice/by-name/dsp mmcblk0p22 ' \
+            -e 's block/bootdevice/by-name/DDR mmcblk0p23 ' \
+            -e 's block/bootdevice/by-name/sec mmcblk0p24 ' \
+            -e 's block/bootdevice/by-name/utags mmcblk0p25 ' \
+            -e 's block/bootdevice/by-name/utagsBackup mmcblk0p26 ' \
+            -e 's block/bootdevice/by-name/modemst1 mmcblk0p27 ' \
+            -e 's block/bootdevice/by-name/modemst2 mmcblk0p28 ' \
+            -e 's block/bootdevice/by-name/fsg mmcblk0p29 ' \
+            -e 's block/bootdevice/by-name/persist mmcblk0p30 ' \
+            -e 's block/bootdevice/by-name/frp mmcblk0p31 ' \
+            -e 's block/bootdevice/by-name/cid mmcblk0p32 ' \
+            -e 's block/bootdevice/by-name/logo mmcblk0p33 ' \
+            -e 's block/bootdevice/by-name/carrier mmcblk0p34 ' \
+            -e 's block/bootdevice/by-name/metadata mmcblk0p35 ' \
+            -e 's block/bootdevice/by-name/kpan mmcblk0p36 ' \
+            -e 's block/bootdevice/by-name/boot mmcblk0p37 ' \
+            -e 's block/bootdevice/by-name/recovery mmcblk0p38 ' \
+            -e 's block/bootdevice/by-name/misc mmcblk0p39 ' \
+            -e 's block/bootdevice/by-name/limits mmcblk0p40 ' \
+            -e 's block/bootdevice/by-name/mota mmcblk0p41 ' \
+            -e 's block/bootdevice/by-name/dip mmcblk0p42 ' \
+            -e 's block/bootdevice/by-name/syscfg mmcblk0p43 ' \
+            -e 's block/bootdevice/by-name/logs mmcblk0p44 ' \
+            -e 's block/bootdevice/by-name/apdp mmcblk0p45 ' \
+            -e 's block/bootdevice/by-name/msadp mmcblk0p46 ' \
+            -e 's block/bootdevice/by-name/dpo mmcblk0p47 ' \
+            -e 's block/bootdevice/by-name/padA mmcblk0p48 ' \
+            -e 's block/bootdevice/by-name/sp mmcblk0p49 ' \
+            -e 's block/bootdevice/by-name/hw mmcblk0p50 ' \
+            -e 's block/bootdevice/by-name/oem mmcblk0p51 ' \
+            -e 's block/bootdevice/by-name/cache mmcblk0p52 ' \
+            -e 's block/bootdevice/by-name/system mmcblk0p53 ' \
+            -e 's block/bootdevice/by-name/userdata mmcblk0p54 ' \
+            "$@"
+        ;;
     *)
         cat <<EOF