diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index cb603d602..3c85707df 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -222,6 +222,8 @@ enum UserSelectablePins {
   GPIO_HM10_TX,        // HM10-BLE-Mijia-bridge serial interface
   GPIO_LE01MR_RX,      // F&F LE-01MR energy meter
   GPIO_LE01MR_TX,      // F&F LE-01MR energy meter
+  GPIO_CC1101_GDO0,    // CC1101 pin for RX
+  GPIO_CC1101_GDO2,    // CC1101 pin for RX
   GPIO_SENSOR_END };
 
 // Programmer selectable GPIO functionality
@@ -790,7 +792,10 @@ const uint8_t kGpioNiceList[] PROGMEM = {
 #ifdef USE_DEEPSLEEP
   GPIO_DEEPSLEEP,
 #endif
-
+#ifdef USE_KEELOQ
+  GPIO_CC1101_GDO0,    // CC1101 pin for RX
+  GPIO_CC1101_GDO2,    // CC1101 pin for RX
+#endif
 };
 
 const uint8_t kModuleNiceList[] PROGMEM = {
diff --git a/tasmota/xdrv_36_keeloq.ino b/tasmota/xdrv_36_keeloq.ino
index f961a2454..edac0ee23 100644
--- a/tasmota/xdrv_36_keeloq.ino
+++ b/tasmota/xdrv_36_keeloq.ino
@@ -27,8 +27,8 @@
 #define Lowpulse         400
 #define Highpulse        800
 
-#define TX_PORT            4              // Outputport for transmission
-#define RX_PORT            5              // Inputport for reception
+#define TX_PORT          pin[GPIO_CC1101_GDO2]              // Outputport for transmission
+#define RX_PORT          pin[GPIO_CC1101_GDO0]              // Inputport for reception
 
 const char kJaroliftCommands[] PROGMEM = "Keeloq|" // prefix
   "SendRaw|SendButton|Set";