diff --git a/src/network/core/address.h b/src/network/core/address.h
index 4c025b584e..2c37860c4b 100644
--- a/src/network/core/address.h
+++ b/src/network/core/address.h
@@ -74,7 +74,7 @@ public:
 	 * @param port the port
 	 * @param family the address family
 	 */
-	NetworkAddress(const char *hostname = "0.0.0.0", uint16 port = 0, int family = AF_INET) :
+	NetworkAddress(const char *hostname = "", uint16 port = 0, int family = AF_UNSPEC) :
 		address_length(0)
 	{
 		/* Also handle IPv6 bracket enclosed hostnames */
diff --git a/src/network/core/config.h b/src/network/core/config.h
index e2fbb5e3a6..bcd85f5942 100644
--- a/src/network/core/config.h
+++ b/src/network/core/config.h
@@ -24,7 +24,7 @@ enum {
 
 	NETWORK_GAME_INFO_VERSION     =    4, ///< What version of game-info do we use?
 	NETWORK_COMPANY_INFO_VERSION  =    5, ///< What version of company info is this?
-	NETWORK_MASTER_SERVER_VERSION =    1, ///< What version of master-server-protocol do we use?
+	NETWORK_MASTER_SERVER_VERSION =    2, ///< What version of master-server-protocol do we use?
 
 	NETWORK_NAME_LENGTH           =   80, ///< The maximum length of the server name and map name, in bytes including '\0'
 	NETWORK_COMPANY_NAME_LENGTH   =   31, ///< The maximum length of the company name, in bytes including '\0'
diff --git a/src/network/core/udp.cpp b/src/network/core/udp.cpp
index 9fd58eb8dd..fec5bfb59b 100644
--- a/src/network/core/udp.cpp
+++ b/src/network/core/udp.cpp
@@ -30,6 +30,7 @@ NetworkUDPSocketHandler::NetworkUDPSocketHandler(NetworkAddressList *bind)
 		 * resolving it we need to add an address for each of
 		 * the address families we support. */
 		*this->bind.Append() = NetworkAddress(NULL, 0, AF_INET);
+		*this->bind.Append() = NetworkAddress(NULL, 0, AF_INET6);
 	}
 }
 
diff --git a/src/table/settings.h b/src/table/settings.h
index 7a422d6d25..78a738d934 100644
--- a/src/table/settings.h
+++ b/src/table/settings.h
@@ -563,7 +563,7 @@ const SettingDesc _settings[] = {
 	  SDTC_VAR(network.frame_freq,            SLE_UINT8,C|S,NO,     0,        0,      100, 0, STR_NULL,                                       NULL),
 	  SDTC_VAR(network.max_join_time,        SLE_UINT16, S, NO,   500,        0,    32000, 0, STR_NULL,                                       NULL),
 	 SDTC_BOOL(network.pause_on_join,                    S, NO,  true,                        STR_NULL,                                       NULL),
-	  SDTC_STR(network.server_bind_ip,         SLE_STRB, S, NO, "0.0.0.0",                    STR_NULL,                                       NULL),
+	  SDTC_STR(network.server_bind_ip,         SLE_STRB, S, NO,    "",                        STR_NULL,                                       NULL),
 	  SDTC_VAR(network.server_port,          SLE_UINT16, S, NO,NETWORK_DEFAULT_PORT,0,65535,0,STR_NULL,                                       NULL),
 	 SDTC_BOOL(network.server_advertise,                 S, NO, false,                        STR_NULL,                                       NULL),
 	  SDTC_VAR(network.lan_internet,          SLE_UINT8, S, NO,     0,        0,        1, 0, STR_NULL,                                       NULL),
@@ -585,7 +585,7 @@ const SettingDesc _settings[] = {
 	  SDTC_VAR(network.min_active_clients,    SLE_UINT8, S, NO,     0,     0, MAX_CLIENTS, 0, STR_NULL,                                       NULL),
 	SDTC_OMANY(network.server_lang,           SLE_UINT8, S, NO,     0,    35, "ANY|ENGLISH|GERMAN|FRENCH|BRAZILIAN|BULGARIAN|CHINESE|CZECH|DANISH|DUTCH|ESPERANTO|FINNISH|HUNGARIAN|ICELANDIC|ITALIAN|JAPANESE|KOREAN|LITHUANIAN|NORWEGIAN|POLISH|PORTUGUESE|ROMANIAN|RUSSIAN|SLOVAK|SLOVENIAN|SPANISH|SWEDISH|TURKISH|UKRAINIAN|AFRIKAANS|CROATIAN|CATALAN|ESTONIAN|GALICIAN|GREEK|LATVIAN", STR_NULL, NULL),
 	 SDTC_BOOL(network.reload_cfg,                       S, NO, false,                        STR_NULL,                                       NULL),
-	  SDTC_STR(network.last_host,              SLE_STRB, S,  0, "0.0.0.0",                    STR_NULL,                                       NULL),
+	  SDTC_STR(network.last_host,              SLE_STRB, S,  0,    "",                        STR_NULL,                                       NULL),
 	  SDTC_VAR(network.last_port,            SLE_UINT16, S,  0,     0,     0,  UINT16_MAX, 0, STR_NULL,                                       NULL),
 #endif /* ENABLE_NETWORK */