diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 24224ef17..c367a3d96 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -335,6 +335,8 @@ file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/Release/*opentx-*simulator${CMA
 # add its library name to be sure
 if(PCB STREQUAL X7 AND PCBREV STREQUAL T12)
   set(FLAVOUR t12)
+elseif(PCB STREQUAL X9D+ AND PCBREV STREQUAL 2019)
+  set(FLAVOUR x9d+2019)
 else()
   string(TOLOWER ${PCB} FLAVOUR)
 endif()
diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt
index d7073617a..d04a4e634 100644
--- a/radio/src/targets/taranis/CMakeLists.txt
+++ b/radio/src/targets/taranis/CMakeLists.txt
@@ -38,7 +38,6 @@ if(PCB STREQUAL X9E)
 elseif(PCB STREQUAL X9D+)
   set(HAPTIC YES)
   set(LUA_EXPORT lua_export_x9d)
-  set(FLAVOUR x9d+)
   add_definitions(-DPCBX9DP -DPCBX9)
   add_definitions(-DEEPROM_VARIANT=0)
   set(GUI_DIR 212x64)
@@ -63,12 +62,14 @@ elseif(PCB STREQUAL X9D+)
     set(STATUS_LEDS YES)
     set(PXX2 ON)
     set(PXX_FREQUENCY "HIGH")
+    set(FLAVOUR x9d+2019)
   else()
     set(CPU_TYPE STM32F2)
     set(CPU_TYPE_FULL STM32F205xE)  # for size report
     set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld)
     set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
     set(STATUS_LEDS NO)
+    set(FLAVOUR x9d+)
   endif()
 elseif(PCB STREQUAL X9D)
   set(CPU_TYPE STM32F2)
diff --git a/tools/build-companion-nightly.sh b/tools/build-companion-nightly.sh
index 92a8db78a..6a9ffca5e 100755
--- a/tools/build-companion-nightly.sh
+++ b/tools/build-companion-nightly.sh
@@ -53,9 +53,15 @@ make -j${JOBS} libsimulator
 cmake ${COMMON_OPTIONS} -DPCB=X7 ${SRCDIR}
 make -j${JOBS} libsimulator
 
+cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=T12 ${SRCDIR}
+make -j${JOBS} libsimulator
+
 cmake ${COMMON_OPTIONS} -DPCB=X9D ${SRCDIR}
 make -j${JOBS} libsimulator
 
+cmake ${COMMON_OPTIONS} -DPCB=X9D+ -DPCBREV=2019 ${SRCDIR}
+make -j${JOBS} libsimulator
+
 cmake ${COMMON_OPTIONS} -DPCB=X9D+ ${SRCDIR}
 make -j${JOBS} libsimulator