diff --git a/src/knx/application_layer.cpp b/src/knx/application_layer.cpp
index 39932a6..547873a 100644
--- a/src/knx/application_layer.cpp
+++ b/src/knx/application_layer.cpp
@@ -118,8 +118,12 @@ void ApplicationLayer::dataBroadcastIndication(HopCountType hopType, Priority pr
             break;
         }
         default:
+#if (defined(USE_TP)||defined(USE_IP))
+            dataSystemBroadcastIndication(hopType, priority, source, apdu);
+#else
             print("Broadcast-indication: unhandled APDU-Type: ");
             println(apdu.type());
+#endif
     }
 }
 
@@ -159,8 +163,12 @@ void ApplicationLayer::dataBroadcastConfirm(AckType ack, HopCountType hopType, P
             break;
         }
         default:
+#if (defined(USE_TP)||defined(USE_IP))
+            dataSystemBroadcastConfirm(hopType, priority, apdu, status);
+#else
             print("Broadcast-confirm: unhandled APDU-Type: ");
             println(apdu.type());
+#endif
     }
 }
 
@@ -198,13 +206,63 @@ void ApplicationLayer::dataSystemBroadcastIndication(HopCountType hopType, Prior
             break;
         }
         default:
+#if !(defined(USE_TP)||defined(USE_IP))
+            // For open media (e.g. PL, RF)
+            print("SystemBroadcast-indication: unhandled APDU-Type: ");
+            println(apdu.type());
+#else
+            // For closed media
+            print("Broadcast-indication: unhandled APDU-Type: ");
+            println(apdu.type());
+#endif
             break;
     }
 }
 
 void ApplicationLayer::dataSystemBroadcastConfirm(HopCountType hopType, Priority priority, APDU& apdu, bool status)
 {
-
+    const uint8_t* data = apdu.data();
+    switch (apdu.type())
+    {
+    case SystemNetworkParameterRead:
+    {
+        uint16_t objectType;
+        uint16_t propertyId;
+        uint8_t testInfo[2];
+        popWord(objectType, data + 1);
+        popWord(propertyId, data + 3);
+        popByte(testInfo[0], data + 4);
+        popByte(testInfo[1], data + 5);
+        propertyId = (propertyId >> 4) & 0x0FFF;;
+        testInfo[0] &= 0x0F;
+        //TODO: _bau.systemNetworkParameterReadLocalConfirm(priority, hopType, objectType, propertyId, testInfo, sizeof(testInfo), status);
+        break;
+    }
+    case DomainAddressSerialNumberWrite:
+    {
+        const uint8_t* knxSerialNumber = &data[1];
+        const uint8_t* domainAddress = &data[7];
+        //TODO: _bau.domainAddressSerialNumberWriteLocalConfirm(priority, hopType, domainAddress, knxSerialNumber, status);
+        break;
+    }
+    case DomainAddressSerialNumberRead:
+    {
+        const uint8_t* knxSerialNumber = &data[1];
+        //TODO: _bau.domainAddressSerialNumberReadLocalConfirm(priority, hopType, knxSerialNumber, status);
+        break;
+    }
+    default:
+#if !(defined(USE_TP)||defined(USE_IP))
+            // For open media (e.g. PL, RF)
+            print("SystemBroadcast-confirm: unhandled APDU-Type: ");
+            println(apdu.type());
+#else
+            // For closed media
+            print("Broadcast-confirm: unhandled APDU-Type: ");
+            println(apdu.type());
+#endif
+            break;
+    }
 }
 
 void ApplicationLayer::dataIndividualIndication(HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu)
@@ -423,8 +481,7 @@ void ApplicationLayer::systemNetworkParameterReadResponse(Priority priority, Hop
 
     //apdu.printPDU();
 
-    //dataSystemBroadcastRequest(AckDontCare, hopType, SystemPriority, apdu);
-    dataBroadcastRequest(AckDontCare, hopType, SystemPriority, apdu);
+    dataSystemBroadcastRequest(AckDontCare, hopType, SystemPriority, apdu);
 }
 
 //TODO: ApplicationLayer::domainAddressSerialNumberWriteRequest()
diff --git a/src/knx/data_link_layer.cpp b/src/knx/data_link_layer.cpp
index d457850..afa3256 100644
--- a/src/knx/data_link_layer.cpp
+++ b/src/knx/data_link_layer.cpp
@@ -45,7 +45,11 @@ void DataLinkLayer::systemBroadcastRequest(AckType ack, FrameFormat format, Prio
 {
     // System Broadcast requests will always be transmitted as broadcast with KNX serial number for open media (e.g. RF medium) 
     // See 3.2.5 p.22
+#if !(defined(USE_TP)||defined(USE_IP))
     sendTelegram(npdu, ack, 0, GroupAddress, format, priority, SysBroadcast);
+#else
+    sendTelegram(npdu, ack, 0, GroupAddress, format, priority, Broadcast);
+#endif
 }
 
 void DataLinkLayer::dataConReceived(CemiFrame& frame, bool success)
@@ -73,10 +77,17 @@ void DataLinkLayer::dataConReceived(CemiFrame& frame, bool success)
 #endif    
 
     if (addrType == GroupAddress && destination == 0)
+    {
+#if !(defined(USE_TP)||defined(USE_IP))
             if (systemBroadcast == SysBroadcast)
                 _networkLayer.systemBroadcastConfirm(ack, type, priority, source, npdu, success);
             else
                 _networkLayer.broadcastConfirm(ack, type, priority, source, npdu, success);                    
+#else
+            (void) systemBroadcast; // not used
+            _networkLayer.broadcastConfirm(ack, type, priority, source, npdu, success);
+#endif
+    }
     else
         _networkLayer.dataConfirm(ack, addrType, destination, type, priority, source, npdu, success);
 
@@ -108,13 +119,13 @@ void DataLinkLayer::frameRecieved(CemiFrame& frame)
 
     if (addrType == GroupAddress && destination == 0)
     {
-#if !defined(USE_TP)
+#if !(defined(USE_TP)||defined(USE_IP))
         if (systemBroadcast == SysBroadcast)
             _networkLayer.systemBroadcastIndication(ack, type, npdu, priority, source);
         else 
             _networkLayer.broadcastIndication(ack, type, npdu, priority, source);
 #else
-        _networkLayer.systemBroadcastIndication(ack, type, npdu, priority, source);
+        (void) systemBroadcast; // not used
         _networkLayer.broadcastIndication(ack, type, npdu, priority, source);
 #endif
     }