diff --git a/bacnet-stack/demo/whois/main.c b/bacnet-stack/demo/whois/main.c
index 82fc8e08..236a8f0f 100644
--- a/bacnet-stack/demo/whois/main.c
+++ b/bacnet-stack/demo/whois/main.c
@@ -110,7 +110,7 @@ static void print_address_cache(
     uint32_t device_id = 0;
     unsigned max_apdu = 0;
 
-//    printf("%-7s %-14s %-4s %-5s %-14s\n", "Device", "MAC", "APDU", "SNET", "SADR");
+/*    printf("%-7s %-14s %-4s %-5s %-14s\n", "Device", "MAC", "APDU", "SNET", "SADR"); */
     printf(";%-7s %-17s %-5s %-17s %-4s\n", "Device", "MAC", "SNET", "SADR", "APDU");
     printf(";------- ----------------- ----- ----------------- ----\n");
     for (i = 0; i < MAX_ADDRESS_CACHE; i++) {
@@ -133,7 +133,7 @@ static void print_address_cache(
                     } else {
                         printf(" ");
                     }
-                    //printf(" ");
+                    /*printf(" "); */
                 }
             }else{
                 printf("0  ");
diff --git a/bacnet-stack/include/config.h b/bacnet-stack/include/config.h
index 3fe7643a..97c96f29 100644
--- a/bacnet-stack/include/config.h
+++ b/bacnet-stack/include/config.h
@@ -67,8 +67,14 @@
 /* Lon=206, MS/TP=480, ARCNET=480, Ethernet=1476, BACnet/IP=64K */
 #if !defined(MAX_APDU)
     /* #define MAX_APDU 50 */
-#define MAX_APDU 480
     /* #define MAX_APDU 1476 */
+#if defined(BACDL_BIP)
+#define MAX_APDU 16383
+#elif defined (BACDL_ETHERNET)
+#define MAX_APDU 1476
+#else
+#define MAX_APDU 480
+#endif
 #endif
 
 /* for confirmed messages, this is the number of transactions */