diff --git a/pyghmi/ipmi/bmc.py b/pyghmi/ipmi/bmc.py
index 4606ebce..f4090c5d 100644
--- a/pyghmi/ipmi/bmc.py
+++ b/pyghmi/ipmi/bmc.py
@@ -142,6 +142,6 @@ class Bmc(serversession.IpmiServer):
             traceback.print_exc()
 
     @classmethod
-    def listen(cls):
+    def listen(cls, timeout=30):
         while True:
-            ipmisession.Session.wait_for_rsp(30)
+            ipmisession.Session.wait_for_rsp(timeout)