diff --git a/servatrice/src/server_logger.cpp b/servatrice/src/server_logger.cpp
index de08c288..7cfaf3ed 100644
--- a/servatrice/src/server_logger.cpp
+++ b/servatrice/src/server_logger.cpp
@@ -31,13 +31,16 @@ ServerLogger::~ServerLogger()
 	flushBuffer();
 }
 
-void ServerLogger::logMessage(QString message)
+void ServerLogger::logMessage(QString message, ServerSocketInterface *ssi)
 {
 	if (!logFile)
 		return;
 	
 	bufferMutex.lock();
-	buffer.append(QDateTime::currentDateTime().toString() + " " + QString::number((qulonglong) QThread::currentThread(), 16) + " " + message);
+	QString ssiString;
+	if (ssi)
+		ssiString = QString::number((qulonglong) ssi) + " ";
+	buffer.append(QDateTime::currentDateTime().toString() + " " + QString::number((qulonglong) QThread::currentThread(), 16) + " " + ssiString + message);
 	bufferMutex.unlock();
 	
 	emit sigFlushBuffer();
diff --git a/servatrice/src/server_logger.h b/servatrice/src/server_logger.h
index 62d78537..77c7f12d 100644
--- a/servatrice/src/server_logger.h
+++ b/servatrice/src/server_logger.h
@@ -9,6 +9,7 @@
 
 class QSocketNotifier;
 class QFile;
+class ServerSocketInterface;
 
 class ServerLogger : public QObject {
 	Q_OBJECT
@@ -17,7 +18,7 @@ public:
 	~ServerLogger();
 	static void hupSignalHandler(int unused);
 public slots:
-	void logMessage(QString message);
+	void logMessage(QString message, ServerSocketInterface *ssi = 0);
 private slots:
 #ifdef Q_OS_UNIX
 	void handleSigHup();
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index f02747ca..f8e01ab4 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -93,7 +93,8 @@ void ServerSocketInterface::flushXmlBuffer()
 void ServerSocketInterface::readClient()
 {
 	QByteArray data = socket->readAll();
-	logger->logMessage(QString(data));
+	if (!data.contains("<cmd type=\"ping\""))
+		logger->logMessage(QString(data), this);
 	xmlReader->addData(data);
 	
 	while (!xmlReader->atEnd()) {