diff --git a/ChangeLog b/ChangeLog
index 45f0b1d5c..89a441c90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Version 0.0.3:
+    * Properly honor the chosen port number if a static host and port are
+      marked as preferred.
+
 Version 0.0.2:
     * Don't reconnect to Jabber if the settings dialog is closed successfully
       but the Jabber settings haven't changed.
diff --git a/src/libtomahawk/network/servent.h b/src/libtomahawk/network/servent.h
index f88581445..21ef28d27 100644
--- a/src/libtomahawk/network/servent.h
+++ b/src/libtomahawk/network/servent.h
@@ -19,8 +19,6 @@
 #ifndef SERVENT_H
 #define SERVENT_H
 
-// port for servent to listen on
-#define DEFAULT_LISTEN_PORT 50210
 // time before new connection terminates if no auth received
 #define AUTH_TIMEOUT 180000
 
@@ -91,7 +89,7 @@ public:
     explicit Servent( QObject* parent = 0 );
     virtual ~Servent();
 
-    bool startListening( QHostAddress ha, bool upnp = false, int port = DEFAULT_LISTEN_PORT );
+    bool startListening( QHostAddress ha, bool upnp, int port );
 
     int port() const { return m_port; }
 
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index d9bf16e57..02d98e1ce 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -465,8 +465,9 @@ TomahawkApp::initLocalCollection()
 void
 TomahawkApp::startServent()
 {
-    bool upnp = !arguments().contains( "--noupnp" ) && TomahawkSettings::instance()->value( "network/upnp", true ).toBool();
-    if ( !Servent::instance()->startListening( QHostAddress( QHostAddress::Any ), upnp ) )
+    bool upnp = !arguments().contains( "--noupnp" ) && TomahawkSettings::instance()->value( "network/upnp", true ).toBool() && !TomahawkSettings::instance()->preferStaticHostPort();
+    int port = TomahawkSettings::instance()->externalPort();
+    if ( !Servent::instance()->startListening( QHostAddress( QHostAddress::Any ), upnp, port ) )
     {
         qDebug() << "Failed to start listening with servent";
         exit( 1 );