diff --git a/Config.h b/Config.h
index 13ace8b..df112ef 100644
--- a/Config.h
+++ b/Config.h
@@ -70,6 +70,12 @@
 // Constant Service LED once repeater is running 
 // #define CONSTANT_SRV_LED
 
+// Use the YSF and P25 LEDs for NXDN
+// #define USE_ALTERNATE_NXDN_LEDS
+
+// Use the D-Star and DMR LEDs for POCSAG
+// #define USE_ALTERNATE_POCSAG_LEDS
+
 // Enable modem debug messages
 // #define ENABLE_DEBUG
 
diff --git a/IOArduino.cpp b/IOArduino.cpp
index e88aa37..41042f1 100644
--- a/IOArduino.cpp
+++ b/IOArduino.cpp
@@ -313,12 +313,21 @@ void CIO::P25_pin(bool on)
 
 void CIO::NXDN_pin(bool on) 
 {
+#if defined(USE_ALTERNATE_NXDN_LEDS)
+  digitalWrite(PIN_YSF_LED, on ? HIGH : LOW);
+  digitalWrite(PIN_P25_LED, on ? HIGH : LOW);
+#else
   digitalWrite(PIN_NXDN_LED, on ? HIGH : LOW);
+#endif
 }
 
 void CIO::POCSAG_pin(bool on)
 {
-  // TODO: add a LED pin for POCSAG mode
+#if defined(USE_ALTERNATE_POCSAG_LEDS)
+  digitalWrite(PIN_DSTAR_LED, on ? HIGH : LOW);
+  digitalWrite(PIN_DMR_LED, on ? HIGH : LOW);
+#endif
+  // TODO: add a separate LED pin for POCSAG mode
 }
 
 void CIO::PTT_pin(bool on) 
diff --git a/IOSTM.cpp b/IOSTM.cpp
index 7d894d6..ac2e26b 100644
--- a/IOSTM.cpp
+++ b/IOSTM.cpp
@@ -644,12 +644,21 @@ void CIO::P25_pin(bool on)
 
 void CIO::NXDN_pin(bool on)
 {
+#if defined(USE_ALTERNATE_NXDN_LEDS)
+  GPIO_WriteBit(PORT_YSF_LED, PIN_YSF_LED, on ? Bit_SET : Bit_RESET);
+  GPIO_WriteBit(PORT_P25_LED, PIN_P25_LED, on ? Bit_SET : Bit_RESET);
+#else
   GPIO_WriteBit(PORT_NXDN_LED, PIN_NXDN_LED, on ? Bit_SET : Bit_RESET);
+#endif
 }
 
 void CIO::POCSAG_pin(bool on)
 {
-  // TODO: add a LED pin for POCSAG mode
+#if defined(USE_ALTERNATE_POCSAG_LEDS)
+  GPIO_WriteBit(PORT_DSTAR_LED, PIN_DSTAR_LED, on ? Bit_SET : Bit_RESET);
+  GPIO_WriteBit(PORT_DMR_LED, PIN_DMR_LED, on ? Bit_SET : Bit_RESET);
+#endif
+  // TODO: add a separate LED pin for POCSAG mode
 }
 
 void CIO::PTT_pin(bool on)