diff --git a/src/osd.cpp b/src/osd.cpp
index 4209cab6b..71e1b54e9 100644
--- a/src/osd.cpp
+++ b/src/osd.cpp
@@ -1,6 +1,7 @@
 #include "osd.h"
 
 #include <QCoreApplication>
+#include <QtDebug>
 
 OSD::OSD(QSystemTrayIcon* tray_icon, QObject* parent)
   : QObject(parent),
@@ -19,11 +20,11 @@ void OSD::SongChanged(const Song &song) {
   if (!song.album().isEmpty())
     message_parts << song.album();
   if (song.disc() > 0)
-    message_parts << QString("Disc %1").arg(song.disc());
+    message_parts << QString("disc %1").arg(song.disc());
   if (song.track() > 0)
-    message_parts << QString("Track %1").arg(song.track());
+    message_parts << QString("track %1").arg(song.track());
 
-  ShowMessage(summary, message_parts.join(" "), "notification-audio-play");
+  ShowMessage(summary, message_parts.join(", "), "notification-audio-play");
 }
 
 void OSD::Paused() {
diff --git a/src/osd_x11.cpp b/src/osd_x11.cpp
index 608d6d232..fa47a368c 100644
--- a/src/osd_x11.cpp
+++ b/src/osd_x11.cpp
@@ -7,6 +7,7 @@
 
 #include <QCoreApplication>
 #include <QtDebug>
+#include <QTextDocument>
 
 void OSD::Init() {
   notification_ = NULL;
@@ -22,10 +23,10 @@ void OSD::ShowMessage(const QString& summary, const QString& message,
 
   if (notification_) {
     notify_notification_update(notification_,
-        STR(summary), STR(message), STR(icon));
+        STR(summary), STR(Qt::escape(message)), STR(icon));
   } else {
     notification_ = notify_notification_new(
-        STR(summary), STR(message), STR(icon), NULL);
+        STR(summary), STR(Qt::escape(message)), STR(icon), NULL);
   }
 
   #undef STR