diff --git a/build.gradle b/build.gradle
index 30c5165c..2e458743 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,5 @@
+def jettyLogLevel = '-Dorg.eclipse.jetty.LEVEL=WARN'
+
 allprojects {
   apply plugin: 'java'
   apply plugin: 'application'
@@ -108,11 +110,7 @@ installDist {
 
 run {
   classpath = files('launcher.jar')
-  args '-w', '8080'
-  args '-x', '8081'
-  args '-i', projectDir
-  args '-h', projectDir
-  jvmArgs '-Dorg.eclipse.jetty.LEVEL=WARN'
+  jvmArgs jettyLogLevel
 }
 
 task shell(type: JavaExec) {
diff --git a/src/dist/server.properties b/src/dist/server.properties
index e0d8a647..2b219de3 100644
--- a/src/dist/server.properties
+++ b/src/dist/server.properties
@@ -2,34 +2,11 @@
 # More information about this file is available at
 # http://helma.org/docs/guide/properties/server.properties/
 
+# HTTP server port
+webPort = 8080
 
-# The SMTP server to use for sending mails. Set and uncomment the
-# following line before trying to send mails from Helma applications.
-#
-# smtp=mail.yourdomain.com
-
-# During development, you may want to uncomment the following line, which
-# will cause errors to be logged directly to the console instead of writing
-# to the log files inside the default ./log directory.
-#
-# logDir = console
-
-# Some examples for server-wide locale settings
-# (please refer to http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
-# for country codes, resp. http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt
-# for language codes).
-#
-# country = AT
-# language = de
-#
-# country = UK
-# language = en
-#
-# country = FR
-# language = fr
-#
-# country = CZ
-# language = cs
+# XML-RPC server port
+xmlRpcPort = 8081
 
 # Comma-separated list of ip addresses which are allowed to access
 # admin applications. Default is localhost for IPv4 and IPv6.
@@ -37,3 +14,19 @@ allowAdmin = 127.0.0.1, ::1
 
 # Credentials for using administrative apps like manage, shell and inspector
 adminAccess = 2e7e46fdfc6174e1330359be2e75e766
+
+# The SMTP server to use for sending mails. Set and uncomment the
+# following line before trying to send mails from Helma applications.
+#smtp = mail.yourdomain.com
+
+# During development, you may want to uncomment the following line, which
+# will cause errors to be logged directly to the console instead of writing
+# to the log files inside the default ./log directory.
+#logDir = console
+
+# Server-wide locale settings
+# (please refer to http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
+# for country codes, resp. http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt
+# for language codes).
+#country = AT
+#language = de