diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp
index c766d384a..13449426e 100644
--- a/src/libtomahawk/network/Servent.cpp
+++ b/src/libtomahawk/network/Servent.cpp
@@ -298,7 +298,7 @@ Servent::registerPeer( const Tomahawk::peerinfo_ptr& peerInfo )
 {
     if ( peerInfo->hasControlConnection() )
     {
-        peerInfoDebug( peerInfo ) << "already had control connection, not doin nuffin: " << peerInfo->controlConnection()->name();
+        peerInfoDebug( peerInfo ) << "already had control connection, doing nothing: " << peerInfo->controlConnection()->name();
         tLog() << "existing control connection has following peers:";
         foreach ( const peerinfo_ptr& otherPeerInfo, peerInfo->controlConnection()->peerInfos() )
         {
diff --git a/src/sourcetree/items/SourceItem.cpp b/src/sourcetree/items/SourceItem.cpp
index 59c99c52d..2afb47b48 100644
--- a/src/sourcetree/items/SourceItem.cpp
+++ b/src/sourcetree/items/SourceItem.cpp
@@ -39,6 +39,7 @@
 #include "utils/ImageRegistry.h"
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
+#include "TomahawkApp.h"
 
 /// SourceItem
 
@@ -156,23 +157,26 @@ SourceItem::tooltip() const
 
     QString t;
 
-
-    // This is kind of debug output for now.
-    t.append( "<PRE>" );
-
-    QString narf("%1: %2\n");
-    t.append( narf.arg( "id" ).arg( m_source->id() ) );
-    t.append( narf.arg( "username" ).arg( m_source->nodeId() ) );
-    t.append( narf.arg( "friendlyname" ).arg( m_source->friendlyName() ) );
-    t.append( narf.arg( "dbfriendlyname" ).arg( m_source->dbFriendlyName() ) );
-
-    t.append("\n");
-    foreach( Tomahawk::peerinfo_ptr p, m_source->peerInfos() )
+    bool showDebugInfo = APP->arguments().contains( "--verbose" );
+    if ( showDebugInfo )
     {
-        QString line( p->sipPlugin()->serviceName() + p->sipPlugin()->friendlyName() + ": " + p->id() + " " + p->friendlyName() );
-        t.append( line + "\n\n" );
+        // This is kind of debug output for now.
+        t.append( "<PRE>" );
+
+        QString narf("%1: %2\n");
+        t.append( narf.arg( "id" ).arg( m_source->id() ) );
+        t.append( narf.arg( "username" ).arg( m_source->nodeId() ) );
+        t.append( narf.arg( "friendlyname" ).arg( m_source->friendlyName() ) );
+        t.append( narf.arg( "dbfriendlyname" ).arg( m_source->dbFriendlyName() ) );
+
+        t.append("\n");
+        foreach( Tomahawk::peerinfo_ptr p, m_source->peerInfos() )
+        {
+            QString line( p->sipPlugin()->serviceName() + p->sipPlugin()->friendlyName() + ": " + p->id() + " " + p->friendlyName() );
+            t.append( line + "\n\n" );
+        }
+        t.append( "</PRE>" );
     }
-    t.append( "</PRE>" );
 
     if ( !m_source->currentTrack().isNull() )
         t.append( m_source->textStatus() );