--- a/contrib/make_flys_release/make_release.sh	Sun Apr 21 10:46:06 2013 +0200
+++ b/contrib/make_flys_release/make_release.sh	Sun Apr 21 10:46:59 2013 +0200
@@ -65,7 +65,7 @@
 #   --seddb-pass                    Sediment db password. Default: $SEDDBPASS
 #   --seddb-back                    Sediment db backend. Default: $SEDDBBACK
 TOMCAT_PORT=${TOMCAT_PORT:-8282}
-MAPSERVER_URL=${MAPSERVER_URL:-flys-devel.intevation.de}
+MAPSERVER_URL=${MAPSERVER_URL:-http://flys-devel.intevation.de}
 WIKI_URL=${WIKI_URL:-https://flys-intern.intevation.de/Flys-3.0}
 # Prefix to FreeSans.ttf
 FONT_PATH=${FONT_PATH:-/opt/flys}
@@ -187,6 +187,11 @@
 echo "[INFO]: Preparing configuration of web client"
 echo "[INFO]: Tomcat Port: $TOMCAT_PORT"
 echo "[INFO]: Artifact Port: $ARTIFACT_PORT"
+
+#Needs to be done before the tomcat replacement below
+sed -i -e "s@http://localhost:8888/flys/mapfish-print@https://localhost/flys-${VERSION}/flys/mapfish-print@g" \
+    $FLYS_SOURCE_DIR/flys/flys-client/src/main/webapp/WEB-INF/web.xml
+
 sed -i -e "s@http://localhost:8181@http://localhost:$ARTIFACT_PORT@g" \
        -e "s@http://localhost:8888@http://localhost:$TOMCAT_PORT@g" \
     $FLYS_SOURCE_DIR/flys/flys-client/src/main/webapp/WEB-INF/web.xml
@@ -194,12 +199,13 @@
 sed -i -e "s@/tmp/flys-client.log@${LOG_DIR}/client-${VERSION}.log@g" \
     $FLYS_SOURCE_DIR/flys/flys-client/src/main/webapp/WEB-INF/log4j.properties
 
-find $FLYS_SOURCE_DIR/flys/flys-artifacts/src/main/resources/ -name messages\*.properties | \
-    xargs sed -i "s@https://flys-intern.intevation.de/Flys-3.0@${WIKI_URL}@g";
-
+# XXX: Are they really used at runtime?
 find $FLYS_SOURCE_DIR/flys/ -name \*.properties -o -name \*.xsl |  \
     xargs sed -i "s@https://flys-intern.intevation.de@${WIKI_URL}@g";
 
+sed -i -e "s@/usr/share/fonts/truetype/freefont@${FONT_PATH}@g" \
+    $FLYS_SOURCE_DIR/flys/flys-client/src/main/webapp/WEB-INF/config.yaml
+
 if [ ! -f $FLYS_SOURCE_DIR/OpenLayers-2.11.tar.gz ]; then
     echo "INFO: download OpenLayers-2.11 for client"
     cd $FLYS_SOURCE_DIR
@@ -264,10 +270,10 @@
 sed -i "s/8181/$ARTIFACT_PORT/g" \
     $WORK_DIR/server/conf/rest-server.xml
 
-sed -i -e "s@http://example.com/@http://${MAPSERVER_URL}/@g" \
+sed -i -e "s@http://example.com/@${MAPSERVER_URL}/@g" \
     $WORK_DIR/server/conf/floodmap.xml
 
-sed -i -e "s@http://example.com/@http://${MAPSERVER_URL}/@g" \
+sed -i -e "s@http://example.com/@${MAPSERVER_URL}/@g" \
     $WORK_DIR/server/conf/rivermap.xml
 
 sed -i -e "s@/usr/share/fonts/truetype/freefont@${FONT_PATH}@g" \
@@ -284,6 +290,7 @@
     > $WORK_DIR/server/conf/log4j.properties
 
 sed -i -e "s@<dgm-path>/path/to/rivers/</dgm-path>@<dgm-path>${DGM_PATH}</dgm-path>@g" \
+       -e "s@<help-url>http://example.com</help-url>@<help-url>${WIKI_URL}</help-url>@g" \
     $WORK_DIR/server/conf/conf.xml
 
 cat > $WORK_DIR/server/conf/seddb-db.xml << EOF