diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt
index 80895a3ba..87ad9a37e 100644
--- a/radio/src/targets/horus/CMakeLists.txt
+++ b/radio/src/targets/horus/CMakeLists.txt
@@ -65,7 +65,6 @@ if (PCB STREQUAL X10)
     set(FUNCTION_SWITCHES ON)
     set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module")
     option(BLUETOOTH "Support for bluetooth module" OFF)
-    option(INTERNAL_GPS "Support for internal NMEA GPS" OFF)
     if (BLUETOOTH)
       set(AUX_SERIAL OFF)
     else()
@@ -82,12 +81,10 @@ if (PCB STREQUAL X10)
     add_definitions(-DRADIO_FAMILY_T16)
     set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
     option(BLUETOOTH "Support for bluetooth module" OFF)
-    option(INTERNAL_GPS "Support for internal GPS" ON)
     add_definitions(-DMANUFACTURER_JUMPER)
     if (NOT BLUETOOTH)
       set(AUX2_SERIAL ON)
     endif()
-    set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")    
     set(FLYSKY_GIMBAL ON)
   elseif (PCBREV STREQUAL TX16S)
     set(FLAVOUR tx16s)
@@ -99,14 +96,12 @@ if (PCB STREQUAL X10)
 
     set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
     option(BLUETOOTH "Support for bluetooth module" OFF)
-    option(INTERNAL_GPS "Support for internal GPS" ON)
     set(SWSERIALPOWER YES)
     set(USB_CHARGER YES)
     add_definitions(-DMANUFACTURER_RADIOMASTER)
     if (NOT BLUETOOTH)
       set(AUX2_SERIAL ON)
     endif()
-    set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
     set(FLYSKY_GIMBAL ON)
     set(FLEXSW "2" CACHE STRING "Max flex inputs usable as switches")
   elseif (PCBREV STREQUAL F16)
@@ -115,9 +110,7 @@ if (PCB STREQUAL X10)
     add_definitions(-DRADIO_FAMILY_T16)
     set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
     option(BLUETOOTH "Support for bluetooth module" OFF)
-    option(INTERNAL_GPS "Support for internal NMEA GPS" OFF)
     add_definitions(-DMANUFACTURER_FATFISH)
-    set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
     set(FLEXSW "2" CACHE STRING "Max flex inputs usable as switches")
     set(VIDEO_SWITCH ON)
   elseif (PCBREV STREQUAL V16)
@@ -126,10 +119,8 @@ if (PCB STREQUAL X10)
     add_definitions(-DRADIO_FAMILY_T16)
     set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module")
     option(BLUETOOTH "Support for bluetooth module" OFF)
-    option(INTERNAL_GPS "Support for internal NMEA GPS" OFF)
     set(SWSERIALPOWER YES)
     add_definitions(-DMANUFACTURER_HELLORADIOSKY)
-    set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
     set(FLEXSW "2" CACHE STRING "Max flex inputs usable as switches")
     set(AUX2_SERIAL OFF)
     set(CSD203_SENSOR ON)
@@ -143,12 +134,10 @@ if (PCB STREQUAL X10)
     add_definitions(-DRADIO_FAMILY_T16)
     set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
     option(BLUETOOTH "Support for bluetooth module" OFF)
-    option(INTERNAL_GPS "Support for internal GPS" ON)    
     add_definitions(-DMANUFACTURER_JUMPER)
     if (NOT BLUETOOTH)
       set(AUX2_SERIAL ON)
     endif()
-    set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")    
     set(FLYSKY_GIMBAL ON)
   else()
     set(FLAVOUR x10)
@@ -161,15 +150,6 @@ elseif (PCB STREQUAL X12S)
   set(FLAVOUR x12s)
   set(BLUETOOTH ON)
   set(PCBREV "13" CACHE STRING "PCB Revision")
-  if(${PCBREV} GREATER 10)
-    option(INTERNAL_GPS "Internal GPS installed" YES)
-  else()
-    option(INTERNAL_GPS "Internal GPS installed" NO)
-    if(NOT INTERNAL_GPS)
-      message("Horus: Internal GPS is optional, use INTERNAL_GPS=YES option to enable it")
-    endif()
-  endif()
-  set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
   set(AUX2_SERIAL ON) # wire to GPS
   set(USE_VS1053B ON)
   set(USE_ADS79xx ON)
@@ -177,6 +157,12 @@ elseif (PCB STREQUAL X12S)
   add_definitions(-DMANUFACTURER_FRSKY)
 endif()
 
+# enable GPS support if there is AUX port available unless otherwise disabled 
+if(AUX_SERIAL)
+  option(INTERNAL_GPS "Support for internal GPS" ON)
+  set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
+endif()
+
 if (BITMAPS_DIR STREQUAL 320x240)
   set(BITMAPS_TARGET bm320_bitmaps)
 elseif (BITMAPS_DIR STREQUAL 800x480)
@@ -196,7 +182,6 @@ set(RADIO_DEPENDENCIES
 
 add_definitions(-DPCBHORUS -DSTM32F429_439xx -DSTM32F429xx -DSDRAM -DCOLORLCD -DHARDWARE_KEYS)
 add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
-add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
 add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
 add_definitions(-DSTM32_SUPPORT_32BIT_TIMERS)
 
@@ -205,8 +190,12 @@ add_definitions(-DTHREADSAFE_MALLOC)
 
 set(SDRAM ON)
 
+if(INTERNAL_GPS)
+  add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
+endif()
+
 if(FUNCTION_SWITCHES)
-add_definitions(-DFUNCTION_SWITCHES)
+  add_definitions(-DFUNCTION_SWITCHES)
 endif()
 
 if(NOT UNEXPECTED_SHUTDOWN)
diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt
index 0943b7f76..ed3d99b93 100644
--- a/radio/src/targets/nv14/CMakeLists.txt
+++ b/radio/src/targets/nv14/CMakeLists.txt
@@ -70,9 +70,12 @@ add_definitions(
 set(SDRAM ON)
 
 add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
-add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
 add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
 
+if(INTERNAL_GPS)
+  add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
+endif()
+
 if(STICKS_DEAD_ZONE)
   add_definitions(-DSTICK_DEAD_ZONE)
 endif()
diff --git a/radio/src/targets/pl18/CMakeLists.txt b/radio/src/targets/pl18/CMakeLists.txt
index 30606a148..1c548b560 100644
--- a/radio/src/targets/pl18/CMakeLists.txt
+++ b/radio/src/targets/pl18/CMakeLists.txt
@@ -114,11 +114,14 @@ add_definitions(
 set(SDRAM ON)
 
 add_definitions(-DAUDIO -DVOICE)
-add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
 add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
 add_definitions(-DCROSSFIRE_NATIVE)
 add_definitions(-DHARDWARE_EXTERNAL_MODULE)
 
+if(INTERNAL_GPS)
+  add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
+endif()
+
 if(USE_RTC_CLOCK)
   message("-- RTC Clock enabled")
   add_definitions(-DRTCLOCK)
diff --git a/radio/src/targets/st16/CMakeLists.txt b/radio/src/targets/st16/CMakeLists.txt
index 2166a9460..a733e33cf 100644
--- a/radio/src/targets/st16/CMakeLists.txt
+++ b/radio/src/targets/st16/CMakeLists.txt
@@ -76,9 +76,12 @@ add_definitions(
 set(SDRAM ON)
 
 add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
-add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
 add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
 
+if(INTERNAL_GPS)
+  add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
+endif()
+
 if(STICKS_DEAD_ZONE)
   add_definitions(-DSTICK_DEAD_ZONE)
 endif()