diff --git a/src/libtomahawk/network/servent.cpp b/src/libtomahawk/network/servent.cpp
index 495e903de..0c0d8285c 100644
--- a/src/libtomahawk/network/servent.cpp
+++ b/src/libtomahawk/network/servent.cpp
@@ -92,17 +92,30 @@ bool
 Servent::startListening( QHostAddress ha, bool upnp, int port )
 {
     m_port = port;
-    // try listening on one port higher as well, to aid debugging
-    // and let you run 2 instances easily
-    if( !listen( ha, m_port ) && !listen( ha, ++m_port ) )
+    int defPort = TomahawkSettings::instance()->defaultPort();
+    // Listen on both the selected port and, if not the same, the default port -- the latter sometimes necessary for zeroconf
+    // TODO: only listen on both when zeroconf sip is enabled
+    // TODO: use a real zeroconf system instead of a simple UDP broadcast?
+    if( !listen( ha, m_port ) )
     {
-        qDebug() << "Failed to listen on port" << m_port;
-        qDebug() << "Error string is " << errorString();
-        return false;
+        bool defPortAlso = false;
+        if( m_port != defPort )
+            defPortAlso = listen( ha, defPort );
+        if( !defPortAlso )
+        {
+            qDebug() << "Failed to listen on both port " << m_port << " and port " << defPort;
+            qDebug() << "Error string is " << errorString();
+            return false;
+        }
+        else
+            qDebug() << "Servent listening on port " << defPort << " servent thread:" << thread();
     }
     else
     {
-        qDebug() << "Servent listening on port" << m_port << " servent thread:" << thread();
+        bool defPortAlso = listen( ha, defPort );
+        qDebug() << "Servent listening on port " << m_port << " servent thread:" << thread();
+        if( defPortAlso )
+            qDebug() << "Servent also listening on port " << defPort << " servent thread:" << thread();
     }
 
     // --lanhack means to advertise your LAN IP over jabber as if it were externallyVisible
diff --git a/src/libtomahawk/tomahawksettings.cpp b/src/libtomahawk/tomahawksettings.cpp
index a4008388b..6af02b76f 100644
--- a/src/libtomahawk/tomahawksettings.cpp
+++ b/src/libtomahawk/tomahawksettings.cpp
@@ -377,6 +377,12 @@ TomahawkSettings::setExternalHostname(const QString& externalHostname)
     setValue( "network/external-hostname", externalHostname );
 }
 
+int
+TomahawkSettings::defaultPort() const
+{
+    return 50210;
+}    
+
 int
 TomahawkSettings::externalPort() const
 {
diff --git a/src/libtomahawk/tomahawksettings.h b/src/libtomahawk/tomahawksettings.h
index f7f5e2922..b836317fc 100644
--- a/src/libtomahawk/tomahawksettings.h
+++ b/src/libtomahawk/tomahawksettings.h
@@ -95,6 +95,7 @@ public:
     QString externalHostname() const;
     void setExternalHostname( const QString& externalHostname );
 
+    int defaultPort() const;
     int externalPort() const;
     void setExternalPort( int externalPort );