diff --git a/data/tools/wesnoth/campaignserver_client.py b/data/tools/wesnoth/campaignserver_client.py
index 922faf70b3f..a1ead970424 100755
--- a/data/tools/wesnoth/campaignserver_client.py
+++ b/data/tools/wesnoth/campaignserver_client.py
@@ -10,7 +10,7 @@ import wesnoth.wmlparser as wmlparser
 dumpi = 0
 class CampaignClient:
     # First port listed will be used as default.
-    portmap = (("15001", "1.8.x"), ("15004", "1.7.x"), ("15003", "1.6.x"), ("15005", "1.4.x"))
+    portmap = (("15002", "1.9.x"), ("15004", "trunk"), ("15001", "1.8.x"), ("15003", "1.6.x"), ("15005", "1.4.x"))
 
     def __init__(self, address = None):
         """
diff --git a/src/addon_checks.cpp b/src/addon_checks.cpp
index 672c98891ed..1a70cbc21d2 100644
--- a/src/addon_checks.cpp
+++ b/src/addon_checks.cpp
@@ -20,7 +20,7 @@
 
 #include <cstring>
 
-const unsigned short default_campaignd_port = 15001;
+const unsigned short default_campaignd_port = 15002;
 
 static bool two_dots(char a, char b)
 {