Index: languagetool/trunk/languagetool.sh
===================================================================
--- languagetool/trunk/languagetool.sh	(revision 105220)
+++ languagetool/trunk/languagetool.sh	(working copy)
@@ -2,14 +2,18 @@
 
 file_present=false
 asked_for_help=false
-start_server=false
+start_server_http=false
+start_server_https=false
 
 for arg in "$@"; do
   if [[ $arg != -* ]]; then
     file_present=true
   fi
+  if [[ $arg == --http ]]; then
+    start_server_http=true
+  fi
   if [[ $arg == --config* ]]; then
-    start_server=true
+    start_server_https=true
   fi
   if [[ $arg == -h ]]; then
     asked_for_help=true
@@ -26,7 +30,8 @@
 
 CLI_command='org.languagetool.commandline.Main'
 GUI_command='org.languagetool.gui.Main'
-SRV_command='org.languagetool.server.HTTPSServer'
+HTTPS_SRV_command='org.languagetool.server.HTTPSServer'
+HTTP_SRV_command='org.languagetool.server.HTTPServer'
 
 if $asked_for_help; then
   echo "Command-line interface (CLI) help:"
@@ -38,8 +43,10 @@
   echo "HTTPS server help:"
   "$JAVA_HOME/bin/java" -cp $CP $SRV_command -h | sed "s/HTTPSServer/languagetool/"
 else
-  if $start_server; then
-    "$JAVA_HOME/bin/java" -cp $CP $SRV_command "$@"
+  if $start_server_https; then
+    "$JAVA_HOME/bin/java" -cp $CP $HTTPS_SRV_command "$@"
+  elif $start_server_http; then
+    "$JAVA_HOME/bin/java" -cp $CP $HTTP_SRV_command "$@"
   else
     if $file_present; then
       "$JAVA_HOME/bin/java" -cp $CP $CLI_command "$@"