diff --git a/target/linux/mpc85xx/config-6.12 b/target/linux/mpc85xx/config-6.18
similarity index 100%
rename from target/linux/mpc85xx/config-6.12
rename to target/linux/mpc85xx/config-6.18
diff --git a/target/linux/mpc85xx/patches-6.12/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch b/target/linux/mpc85xx/patches-6.18/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch
rename to target/linux/mpc85xx/patches-6.18/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch
diff --git a/target/linux/mpc85xx/patches-6.12/010-powerpc-add-compressed-zImage-for-mpc85xx.patch b/target/linux/mpc85xx/patches-6.18/010-powerpc-add-compressed-zImage-for-mpc85xx.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/010-powerpc-add-compressed-zImage-for-mpc85xx.patch
rename to target/linux/mpc85xx/patches-6.18/010-powerpc-add-compressed-zImage-for-mpc85xx.patch
diff --git a/target/linux/mpc85xx/patches-6.12/100-powerpc-85xx-tl-wdr4900-v1-support.patch b/target/linux/mpc85xx/patches-6.18/100-powerpc-85xx-tl-wdr4900-v1-support.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/100-powerpc-85xx-tl-wdr4900-v1-support.patch
rename to target/linux/mpc85xx/patches-6.18/100-powerpc-85xx-tl-wdr4900-v1-support.patch
diff --git a/target/linux/mpc85xx/patches-6.12/101-powerpc-85xx-hiveap-330-support.patch b/target/linux/mpc85xx/patches-6.18/101-powerpc-85xx-hiveap-330-support.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/101-powerpc-85xx-hiveap-330-support.patch
rename to target/linux/mpc85xx/patches-6.18/101-powerpc-85xx-hiveap-330-support.patch
diff --git a/target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch
rename to target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch
diff --git a/target/linux/mpc85xx/patches-6.12/103-powerpc-85xx-red-15w-rev1.patch b/target/linux/mpc85xx/patches-6.18/103-powerpc-85xx-red-15w-rev1.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/103-powerpc-85xx-red-15w-rev1.patch
rename to target/linux/mpc85xx/patches-6.18/103-powerpc-85xx-red-15w-rev1.patch
diff --git a/target/linux/mpc85xx/patches-6.12/104-powerpc-mpc85xx-change-P2020RDB-dts-file-for-OpenWRT.patch b/target/linux/mpc85xx/patches-6.18/104-powerpc-mpc85xx-change-P2020RDB-dts-file-for-OpenWRT.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/104-powerpc-mpc85xx-change-P2020RDB-dts-file-for-OpenWRT.patch
rename to target/linux/mpc85xx/patches-6.18/104-powerpc-mpc85xx-change-P2020RDB-dts-file-for-OpenWRT.patch
diff --git a/target/linux/mpc85xx/patches-6.12/105-powerpc-85xx-panda-support.patch b/target/linux/mpc85xx/patches-6.18/105-powerpc-85xx-panda-support.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/105-powerpc-85xx-panda-support.patch
rename to target/linux/mpc85xx/patches-6.18/105-powerpc-85xx-panda-support.patch
diff --git a/target/linux/mpc85xx/patches-6.12/106-powerpc-85xx-ws-ap3710i-support.patch b/target/linux/mpc85xx/patches-6.18/106-powerpc-85xx-ws-ap3710i-support.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/106-powerpc-85xx-ws-ap3710i-support.patch
rename to target/linux/mpc85xx/patches-6.18/106-powerpc-85xx-ws-ap3710i-support.patch
diff --git a/target/linux/mpc85xx/patches-6.12/107-powerpc-85xx-add-ws-ap3825i-support.patch b/target/linux/mpc85xx/patches-6.18/107-powerpc-85xx-add-ws-ap3825i-support.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/107-powerpc-85xx-add-ws-ap3825i-support.patch
rename to target/linux/mpc85xx/patches-6.18/107-powerpc-85xx-add-ws-ap3825i-support.patch
diff --git a/target/linux/mpc85xx/patches-6.12/108-powerpc-85xx-firebox-t10-t15-support.patch b/target/linux/mpc85xx/patches-6.18/108-powerpc-85xx-firebox-t10-t15-support.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/108-powerpc-85xx-firebox-t10-t15-support.patch
rename to target/linux/mpc85xx/patches-6.18/108-powerpc-85xx-firebox-t10-t15-support.patch
diff --git a/target/linux/mpc85xx/patches-6.12/109-powerpc-85xx-add-ws-ap3715i-support.patch b/target/linux/mpc85xx/patches-6.18/109-powerpc-85xx-add-ws-ap3715i-support.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/109-powerpc-85xx-add-ws-ap3715i-support.patch
rename to target/linux/mpc85xx/patches-6.18/109-powerpc-85xx-add-ws-ap3715i-support.patch
diff --git a/target/linux/mpc85xx/patches-6.12/110-powerpc-85xx-br200-wp-support.patch b/target/linux/mpc85xx/patches-6.18/110-powerpc-85xx-br200-wp-support.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/110-powerpc-85xx-br200-wp-support.patch
rename to target/linux/mpc85xx/patches-6.18/110-powerpc-85xx-br200-wp-support.patch
diff --git a/target/linux/mpc85xx/patches-6.12/111-powerpc-85xx-hpe-msm-support.patch b/target/linux/mpc85xx/patches-6.18/111-powerpc-85xx-hpe-msm-support.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/111-powerpc-85xx-hpe-msm-support.patch
rename to target/linux/mpc85xx/patches-6.18/111-powerpc-85xx-hpe-msm-support.patch
diff --git a/target/linux/mpc85xx/patches-6.12/112-powerpc-85xx-add-zimage-la3000-to-p2020.patch b/target/linux/mpc85xx/patches-6.18/112-powerpc-85xx-add-zimage-la3000-to-p2020.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/112-powerpc-85xx-add-zimage-la3000-to-p2020.patch
rename to target/linux/mpc85xx/patches-6.18/112-powerpc-85xx-add-zimage-la3000-to-p2020.patch
diff --git a/target/linux/mpc85xx/patches-6.12/150-arch-powerpc-simpleboot-prevent-overwrite-of-CPU1-sp.patch b/target/linux/mpc85xx/patches-6.18/150-arch-powerpc-simpleboot-prevent-overwrite-of-CPU1-sp.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/150-arch-powerpc-simpleboot-prevent-overwrite-of-CPU1-sp.patch
rename to target/linux/mpc85xx/patches-6.18/150-arch-powerpc-simpleboot-prevent-overwrite-of-CPU1-sp.patch
diff --git a/target/linux/mpc85xx/patches-6.12/900-powerpc-bootwrapper-disable-uImage-generation.patch b/target/linux/mpc85xx/patches-6.18/900-powerpc-bootwrapper-disable-uImage-generation.patch
similarity index 100%
rename from target/linux/mpc85xx/patches-6.12/900-powerpc-bootwrapper-disable-uImage-generation.patch
rename to target/linux/mpc85xx/patches-6.18/900-powerpc-bootwrapper-disable-uImage-generation.patch