killbill-memoizeit

diff --git a/bin/start-server b/bin/start-server
index e5e81b7..05ef3d1 100755
--- a/bin/start-server
+++ b/bin/start-server
@@ -65,7 +65,7 @@ function start() {
             debug_opts_eclipse=$DEBUG_OPTS_ECLIPSE
         fi
     fi
-    export MAVEN_OPTS="$MAVEN_OPTS $debug_opts_eclipse"
+    export MAVEN_OPTS="$MAVEN_OPTS $debug_opts_eclipse -Djetty.port=$PORT"
 
     echo "Starting IRS MAVEN_OPTS = $MAVEN_OPTS"
     echo "$start_cmd"
@@ -74,7 +74,7 @@ function start() {
 }
 
 
-while getopts ":pswdh" options; do
+while getopts ":p:swdh" options; do
   case $options in
 	s ) START=1;;
 	d ) DEBUG=1;;

diff --git a/profiles/killbill/src/main/jetty-config/jetty-conf.xml b/profiles/killbill/src/main/jetty-config/jetty-conf.xml
index 3423b27..5667db1 100644
--- a/profiles/killbill/src/main/jetty-config/jetty-conf.xml
+++ b/profiles/killbill/src/main/jetty-config/jetty-conf.xml
@@ -61,16 +61,16 @@
         <Arg>
             <New class="org.eclipse.jetty.server.bio.SocketConnector">
                 <Set name="host">
-                    <SystemProperty name="xn.server.ip"/>
+                    <SystemProperty name="jetty.host"/>
                 </Set>
                 <Set name="port">
-                    <SystemProperty name="xn.server.port" default="8080"/>
+                    <SystemProperty name="jetty.port" default="8080"/>
                 </Set>
                 <Set name="maxIdleTime">300000</Set>
                 <Set name="Acceptors">2</Set>
                 <Set name="statsOn">true</Set>
                 <Set name="confidentialPort">
-                    <SystemProperty name="xn.server.ssl.port" default="8443"/>
+                    <SystemProperty name="jetty.ssl.port" default="8443"/>
                 </Set>
             </New>
         </Arg>