diff --git a/README.md b/README.md
index 050f481c6..634e96605 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ https://source.codeaurora.org/quic/la/kernel/lk/) (tag `LA.BR.1.2.9.1-02310-8x16
 which is a heavily modified version of the [Little Kernel Embedded Operating System].
 
 ## Supported SoCs
-- `lk2nd-msm8909`: APQ8009, MSM8909
+- `lk2nd-msm8909`: APQ8009W, MSM8909
 - `lk2nd-msm8916`: APQ8016, MSM8216, MSM8916, MSM8929, MSM8939
 - `lk2nd-msm8974`: MSM8974
 - `lk2nd-msm8226`: APQ8026, MSM8226, MSM8926
@@ -50,7 +50,7 @@ page on the EFIDroid wiki for an exact mapping of LK targets to SoCs.
 ## Supported devices
 ### lk2nd-msm8909
 - Acer Liquid Z330 - T01
-- Mobvoi TicWatch Pro - catfish
+- Mobvoi TicWatch Pro - catfish (use `lk2nd-msm8909-appended-dtb.img`)
 
 ### lk2nd-msm8916
 - Acer Iconia Talk S A1-724 (quirky - see comment in `dts/msm8916/msm8916-mtp-smb1360.dts`)
diff --git a/dts/msm8909/apq8009w-wtp.dts b/dts/msm8909/apq8009w-wtp.dts
new file mode 100644
index 000000000..7a2e6087e
--- /dev/null
+++ b/dts/msm8909/apq8009w-wtp.dts
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+/dts-v1/;
+
+#include <skeleton.dtsi>
+
+/ {
+	compatible = "qcom,apq8009-mtp", "qcom,apq8009", "qcom,mtp";
+
+	// This is used by the bootloader to find the correct DTB
+	qcom,msm-id = <265 0>, <301 0>;
+	qcom,board-id= <8 0x105>;
+
+	mobvoi-catfish {
+		model = "Mobvoi TicWatch Pro";
+		compatible = "mobvoi,catfish", "qcom,apq8009w", "lk2nd,device";
+		lk2nd,match-panel;
+
+		panel {
+			compatible = "mobvoi,catfish-panel";
+
+			qcom,mdss_dsi_rm67162_wqvga_cmd {
+				compatible = "mobvoi,rm67162";
+			};
+		};
+	};
+};
diff --git a/dts/msm8909/msm8909-catfish.dts b/dts/msm8909/msm8909-catfish.dts
deleted file mode 100644
index bb6a4ec4f..000000000
--- a/dts/msm8909/msm8909-catfish.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-
-/dts-v1/;
-
-#include <skeleton.dtsi>
-
-/ {
-	qcom,msm-id = <265 0>, <301 0>;
-	qcom,board-id= <8 0x105>;
-	lk2nd,match-cmdline = "* mdss_mdp3.panel=1:dsi:0:qcom,mdss_dsi_rm67162_wqvga_cmd:1:none:cfg:single_dsi";
-
-	model = "Mobvoi TicWatch Pro";
-	compatible = "mobvoi,catfish", "qcom,msm8909", "lk2nd,device";
-};
diff --git a/dts/msm8909/rules.mk b/dts/msm8909/rules.mk
index 145280c7f..d9f3c94ff 100644
--- a/dts/msm8909/rules.mk
+++ b/dts/msm8909/rules.mk
@@ -1,5 +1,5 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
 DTBS += \
-	$(LOCAL_DIR)/msm8909-1gb-qrd-skuc.dtb \
-	$(LOCAL_DIR)/msm8909-catfish.dtb
+	$(LOCAL_DIR)/apq8009w-wtp.dtb \
+	$(LOCAL_DIR)/msm8909-1gb-qrd-skuc.dtb