diff --git a/apps/config/sql/configvalue.sql b/apps/config/sql/configvalue.sql
index c77a099010..a3989eec59 100644
--- a/apps/config/sql/configvalue.sql
+++ b/apps/config/sql/configvalue.sql
@@ -1,7 +1,6 @@
 INSERT INTO config_configvalue VALUES(1,'site_name','Evennia Test Site');
-INSERT INTO config_configvalue VALUES(2,'site_port','4000');
-INSERT INTO config_configvalue VALUES(3,'player_dbnum_start','2');
-INSERT INTO config_configvalue VALUES(4,'money_name_plural','Credits');
-INSERT INTO config_configvalue VALUES(5,'money_name_singular','Credit');
-INSERT INTO config_configvalue VALUES(6,'game_firstrun','1');
-INSERT INTO config_configvalue VALUES(7,'idle_timeout','1800');
+INSERT INTO config_configvalue VALUES(2,'player_dbnum_start','2');
+INSERT INTO config_configvalue VALUES(3,'money_name_plural','Credits');
+INSERT INTO config_configvalue VALUES(4,'money_name_singular','Credit');
+INSERT INTO config_configvalue VALUES(5,'game_firstrun','1');
+INSERT INTO config_configvalue VALUES(6,'idle_timeout','1800');
diff --git a/server.py b/server.py
index 01911427f6..72e87a4bd9 100755
--- a/server.py
+++ b/server.py
@@ -123,4 +123,4 @@ mud_service = EvenniaService('Evennia Server')
 
 # Sheet sheet, fire ze missiles!
 serviceCollection = service.IServiceCollection(application)
-internet.TCPServer(4000, mud_service.getEvenniaServiceFactory()).setServiceParent(serviceCollection)
+internet.TCPServer(settings.GAMEPORT, mud_service.getEvenniaServiceFactory()).setServiceParent(serviceCollection)
diff --git a/settings.py.dist b/settings.py.dist
index ea9aa238f5..e3f6b0df85 100755
--- a/settings.py.dist
+++ b/settings.py.dist
@@ -81,3 +81,4 @@ INSTALLED_APPS = (
 )
 
 LOGFILE = 'logs/evennia.log'
+GAMEPORT = 4000