diff --git a/Scripts/sogod-wrapper b/Scripts/sogod-wrapper
index 039563060..a0da33bf9 100755
--- a/Scripts/sogod-wrapper
+++ b/Scripts/sogod-wrapper
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2007-2009 Inverse inc.
 #
-# Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+# Authors: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 #          Francis Lachapelle <flachapelle@inverse.ca>
 #
 # This file is free software; you can redistribute it and/or modify
@@ -22,16 +22,8 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-# Uncomment the following line for Oracle RAC. This is where
-# should be located the tnsnames.ora.
-#export TNS_ADMIN=/home/sogo
-
-if [ -z "$1" ]
-then
-  PIDFILE=/var/run/sogo/sogod.pid
-else
-  PIDFILE=/var/run/sogo/sogod.$1
-fi
+PIDFILE=/var/run/sogo/sogo.pid
+LOGFILE=/var/log/sogo/sogo.log
 
 if [ -f /etc/GNUstep/GNUstep.conf ]; then
     . /etc/GNUstep/GNUstep.conf
@@ -59,27 +51,6 @@ else
     exit 1
 fi
 
-woport=`defaults read sogod WOPort`
-if [ "$?" -eq 0 ]
-then
-  startport=`echo $woport | awk '{print $3}' | sed -e 's/\(.*:\)//'`
-else
-  startport=20000
-fi
-
-if [ -z "$1" ]
-then
-  port=$startport
-else
-  let "port=$startport + $1 - 1"
-fi
-listen=`echo $woport | awk '{ print $3 }' | sed -e 's/\([0-9]\+\)$/'$port'/g'`
-
-if [ -z "$listen" ]
-then
-  listen=$port
-fi
-
 # echo "SOGOD: $sogod -WOPort $listen" 2>&1
 
-exec $sogod -WOPort $listen -WOLogFile /var/log/sogo/sogod.log -WOPidFile $PIDFILE
+exec $sogod -WOLogFile $LOGFILE -WOPidFile $PIDFILE