diff --git a/esp8266/scripts/port_diag.py b/esp8266/scripts/port_diag.py
index fd7ee52d14..b97c743051 100644
--- a/esp8266/scripts/port_diag.py
+++ b/esp8266/scripts/port_diag.py
@@ -1,5 +1,6 @@
 import esp
 import uctypes
+import lwip
 
 
 def main():
@@ -7,6 +8,7 @@ def main():
     ROM = uctypes.bytearray_at(0x40200000, 16)
     fid = esp.flash_id()
 
+    print("FlashROM:")
     print("Flash ID: %x (Vendor: %x Device: %x)" % (fid, fid & 0xff, fid & 0xff00 | fid >> 16))
 
     print("Flash bootloader data:")
@@ -15,5 +17,12 @@ def main():
     print("Byte @2: %02x" % ROM[2])
     print("Byte @3: %02x (Flash size: %s Flash freq: %s)" % (ROM[3], SZ_MAP.get(ROM[3] >> 4, "?"), FREQ_MAP.get(ROM[3] & 0xf)))
 
+    print("\nNetworking:")
+    print("Free WiFi driver buffers of type:")
+    for i in range(5):
+        print("%d: %d" % (i, esp.esf_free_bufs(i)))
+    print("lwIP PCBs:")
+    lwip.print_pcbs()
+
 
 main()