diff --git a/src/ebusd/bushandler.cpp b/src/ebusd/bushandler.cpp
index 04eed0b4..0b86c451 100644
--- a/src/ebusd/bushandler.cpp
+++ b/src/ebusd/bushandler.cpp
@@ -785,10 +785,15 @@ void BusHandler::receiveCompleted()
 	if (m_grabUnknownMessages==gr_all || (message==NULL && m_grabUnknownMessages==gr_unknown)) {
 		string data;
 		string key = data = m_command.getDataStr();
-		if (key.length() > 2*(1+1+2+1+4))
+		if (key.length() > 2*(1+1+2+1+4)) {
 			key = key.substr(0, 2*(1+1+2+1+4)); // QQZZPBSBNN + up to 4 DD bytes
-		if (dstAddress != BROADCAST && !master)
+		}
+		if (dstAddress != BROADCAST && !master) {
 			data += " / " + m_response.getDataStr();
+		}
+		if (message) {
+			data += " = "+message->getCircuit()+" "+message->getName();
+		}
 		m_grabbedUnknownMessages[key] = data;
 	}
 	if (message == NULL) {
diff --git a/src/ebusd/bushandler.h b/src/ebusd/bushandler.h
index f6e7f40f..a503ee66 100644
--- a/src/ebusd/bushandler.h
+++ b/src/ebusd/bushandler.h
@@ -326,7 +326,7 @@ public:
 		  m_symPerSec(0), m_maxSymPerSec(0),
 		  m_state(bs_noSignal), m_repeat(false),
 		  m_command(false), m_commandCrcValid(false), m_response(false), m_responseCrcValid(false),
-		  m_grabUnknownMessages(gr_none) {
+		  m_grabUnknownMessages(gr_all) {
 		memset(m_seenAddresses, 0, sizeof(m_seenAddresses));
 	}