Index: binaries/data/config/default.cfg
===================================================================
--- binaries/data/config/default.cfg
+++ binaries/data/config/default.cfg
@@ -413,6 +413,7 @@
 history = 0                         ; Number of past messages to display on join
 room = "arena23"                    ; Default MUC room to join
 server = "lobby.wildfiregames.com"  ; Address of lobby server
+port = 5222                         ; Port of lobby server
 xpartamupp = "wfgbot23"             ; Name of the server-side XMPP-account that manage games
 echelon = "echelon23"               ; Name of the server-side XMPP-account that manages ratings
 buddies = ","                       ; Comma separated list of playernames that the current user has marked as buddies
Index: source/lobby/XmppClient.h
===================================================================
--- source/lobby/XmppClient.h
+++ source/lobby/XmppClient.h
@@ -53,6 +53,8 @@
 	std::string m_xpartamuppId;
 	std::string m_echelonId;
 
+	int m_port;
+
 	// State
 	bool m_initialLoadComplete;
 	bool m_isConnected;
Index: source/lobby/XmppClient.cpp
===================================================================
--- source/lobby/XmppClient.cpp
+++ source/lobby/XmppClient.cpp
@@ -75,12 +75,13 @@
  * @param regOpt If we are just registering or not.
  */
 XmppClient::XmppClient(const std::string& sUsername, const std::string& sPassword, const std::string& sRoom, const std::string& sNick, const int historyRequestSize, bool regOpt)
-       : m_client(NULL), m_mucRoom(NULL), m_registration(NULL), m_username(sUsername), m_password(sPassword), m_room(sRoom), m_nick(sNick), m_initialLoadComplete(false), m_isConnected(false), m_sessionManager()
+       : m_client(NULL), m_mucRoom(NULL), m_registration(NULL), m_username(sUsername), m_password(sPassword), m_room(sRoom), m_nick(sNick), m_port(-1), m_initialLoadComplete(false), m_isConnected(false), m_sessionManager()
 {
 	// Read lobby configuration from default.cfg
 	std::string sXpartamupp;
 	std::string sEchelon;
 	CFG_GET_VAL("lobby.server", m_server);
+	CFG_GET_VAL("lobby.port", m_port);
 	CFG_GET_VAL("lobby.xpartamupp", sXpartamupp);
 	CFG_GET_VAL("lobby.echelon", sEchelon);
 
@@ -92,9 +93,12 @@
 	// If we are connecting, use the full jid and a password
 	// If we are registering, only use the server name
 	if (!regOpt)
-		m_client = new glooxwrapper::Client(clientJid, sPassword);
+		m_client = new glooxwrapper::Client(clientJid, sPassword, m_port);
 	else
+	{
 		m_client = new glooxwrapper::Client(m_server);
+		m_client->setPort(m_port);
+	}
 
 	// Disable TLS as we haven't set a certificate on the server yet
 	m_client->setTls(gloox::TLSDisabled);
Index: source/lobby/glooxwrapper/glooxwrapper.h
===================================================================
--- source/lobby/glooxwrapper/glooxwrapper.h
+++ source/lobby/glooxwrapper/glooxwrapper.h
@@ -397,6 +397,7 @@
 		const string getID() const;
 		void send(const IQ& iq);
 
+		void setPort(int port);
 		void setTls(gloox::TLSPolicy tls);
 		void setCompression(bool compression);
 
Index: source/lobby/glooxwrapper/glooxwrapper.cpp
===================================================================
--- source/lobby/glooxwrapper/glooxwrapper.cpp
+++ source/lobby/glooxwrapper/glooxwrapper.cpp
@@ -352,6 +352,11 @@
 	m_Wrapped->send(iq.getWrapped());
 }
 
+void glooxwrapper::Client::setPort(int port)
+{
+	m_Wrapped->setPort(port);
+}
+
 void glooxwrapper::Client::setTls(gloox::TLSPolicy tls)
 {
 	m_Wrapped->setTls(tls);
Index: source/tools/XpartaMuPP/EcheLOn.py
===================================================================
--- source/tools/XpartaMuPP/EcheLOn.py
+++ source/tools/XpartaMuPP/EcheLOn.py
@@ -771,6 +771,9 @@
   optp.add_option('-s', '--server', help='address of the ejabberd server',
                   action='store', dest='xserver',
                   default="localhost")
+  optp.add_option('-P', '--port', help='ejabberd server port',
+                  action='store', dest='xport', type='int',
+                  default=5222)
 
   opts, args = optp.parse_args()
 
@@ -786,7 +789,7 @@
   xmpp.register_plugin('xep_0060') # PubSub
   xmpp.register_plugin('xep_0199') # XMPP Ping
 
-  if xmpp.connect((opts.xserver, 5222)):
+  if xmpp.connect((opts.xserver, opts.xport)):
     xmpp.process(threaded=False)
   else:
     logging.error("Unable to connect")
Index: source/tools/XpartaMuPP/XpartaMuPP.py
===================================================================
--- source/tools/XpartaMuPP/XpartaMuPP.py
+++ source/tools/XpartaMuPP/XpartaMuPP.py
@@ -639,6 +639,9 @@
   optp.add_option('-s', '--server', help='address of the ejabberd server',
                   action='store', dest='xserver',
                   default="localhost")
+  optp.add_option('-P', '--port', help='ejabberd server port',
+                  action='store', dest='xport', type='int',
+                  default=5222)
 
   opts, args = optp.parse_args()
 
@@ -654,7 +657,7 @@
   xmpp.register_plugin('xep_0060') # PubSub
   xmpp.register_plugin('xep_0199') # XMPP Ping
 
-  if xmpp.connect((opts.xserver, 5222)):
+  if xmpp.connect((opts.xserver, opts.xport)):
     xmpp.process(threaded=False)
   else:
     logging.error("Unable to connect")