diff --git a/fw.json b/fw.json
index af72fa5f25..34e103e3f9 100644
--- a/fw.json
+++ b/fw.json
@@ -22,6 +22,7 @@
         ["Jumper T-Pro", "tpro-"],
         ["RadioMaster T8", "t8-"],
         ["RadioMaster TX12", "tx12-"],
+        ["RadioMaster TX12MK2", "tx12mk2-"],
         ["RadioMaster TX16S", "tx16s-"],
         ["RadioMaster Zorro","zorro-"]
     ],
diff --git a/radio/util/fwoptions.py b/radio/util/fwoptions.py
index 753a6e52e7..4a1d29b678 100755
--- a/radio/util/fwoptions.py
+++ b/radio/util/fwoptions.py
@@ -271,6 +271,19 @@ options_radiomaster_tx12 = {
     "afhds3": ("AFHDS3", "YES", "NO")
 }
 
+options_radiomaster_tx12mk2 = {
+    "noheli": ("HELI", "NO", "YES"),
+    "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"),
+    "lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"),
+    "nogvars": ("GVARS", "NO", "YES"),
+    "faimode": ("FAI", "YES", None),
+    "faichoice": ("FAI", "CHOICE", None),
+    "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
+    "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
+    "afhds3": ("AFHDS3", "YES", "NO"),
+    "internalelrs": ("INTERNAL_MODULE_ELRS", "YES", "NO"),
+}
+
 options_radiomaster_zorro = {
     "noheli": ("HELI", "NO", "YES"),
     "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"),
diff --git a/tools/build-gh.sh b/tools/build-gh.sh
index f10b3497b0..6b96f1c25d 100755
--- a/tools/build-gh.sh
+++ b/tools/build-gh.sh
@@ -110,6 +110,9 @@ do
         tx12)
             BUILD_OPTIONS+="-DPCB=X7 -DPCBREV=TX12"
             ;;
+        tx12mk2)
+            BUILD_OPTIONS+="-DPCB=X7 -DPCBREV=TX12MK2"
+            ;;
         t8)
             BUILD_OPTIONS+="-DPCB=X7 -DPCBREV=T8"
             ;;
diff --git a/tools/build-radiomaster.py b/tools/build-radiomaster.py
index f1db01305b..99c3d8d9ef 100755
--- a/tools/build-radiomaster.py
+++ b/tools/build-radiomaster.py
@@ -29,6 +29,16 @@ boards = {
         "PCBREV": "TX12",
         "DEFAULT_MODE": "2",
     },
+    "TX12MK2_1": {
+        "PCB": "X7",
+        "PCBREV": "TX12MK2",
+        "DEFAULT_MODE": "1",
+    },
+    "TX12MK2_2": {
+        "PCB": "X7",
+        "PCBREV": "TX12MK2",
+        "DEFAULT_MODE": "2",
+    },
     "ZORRO_1": {
         "PCB": "X7",
         "PCBREV": "ZORRO",
diff --git a/tools/generate-yaml.sh b/tools/generate-yaml.sh
index 79d5f39b15..25847c699e 100755
--- a/tools/generate-yaml.sh
+++ b/tools/generate-yaml.sh
@@ -44,6 +44,9 @@ do
         tx12)
             BUILD_OPTIONS+="-DPCB=X7 -DPCBREV=TX12"
             ;;
+        tx12mk2)
+            BUILD_OPTIONS+="-DPCB=X7 -DPCBREV=TX12MK2"
+            ;;
         zorro)
             BUILD_OPTIONS+="-DPCB=X7 -DPCBREV=ZORRO"
             ;;