diff --git a/evomaintenance.sh b/evomaintenance.sh
index 8dba238..43e328f 100644
--- a/evomaintenance.sh
+++ b/evomaintenance.sh
@@ -7,6 +7,8 @@
 # version 0.2
 # Copyright 2007-2008 Gregory Colpart <reg@evolix.fr>, Evolix <info@evolix.fr>
 
+SYSTEME=$(uname -s)
+
 test -f /etc/evomaintenance.cf && . /etc/evomaintenance.cf
 
 [ $HOSTNAME ] || HOSTNAME=`hostname`
@@ -15,11 +17,23 @@ test -f /etc/evomaintenance.cf && . /etc/evomaintenance.cf
 PATH=$PATH:/usr/sbin
 SENDMAIL=$(which sendmail)
 # get ipaddress
-IP=`LC_ALL=C who | grep $(ps -o tty= | tail -1) | tr -s ' ' | cut -d" " -f6 | sed -e "s/^(// ; s/)$//"`
 
-# get begin_date
-BEGIN_YEAR=`date "+%Y"`
-BEGIN_DATE=`LC_ALL=C who | grep $(ps -o tty= | tail -1) | tr -s ' ' | cut -d" " -f3,4,5`
+if [ $SYSTEME = "Linux" ]; then
+	IP=`LC_ALL=C who | grep $(ps -o tty= | tail -1) | tr -s ' ' | cut -d" " -f6 | sed -e "s/^(// ; s/)$//"`
+	# get begin_date
+	BEGIN_YEAR=`date "+%Y"`
+	BEGIN_DATE=`LC_ALL=C who | grep $(ps -o tty= | tail -1) | tr -s ' ' | cut -d" " -f3,4,5`
+	_USER=$SUDO_USER
+elif [ $SYSTEME = "OpenBSD" ]; then
+	IP=`LC_ALL=C who | grep $(env | grep SSH_TTY | cut -d"/" -f3) | tr -s ' ' | cut -d" " -f6  | sed -e "s/^(// ; s/)$//"`
+	# get begin_date
+	BEGIN_YEAR=`date "+%Y"`
+	BEGIN_DATE=`LC_ALL=C who | grep $(env | grep SSH_TTY | cut -d"/" -f3) | tr -s ' ' | cut -d" " -f3,4,5`
+	_USER=$USER
+else
+	echo "OS not detected!"
+	exit 1
+fi
 
 # end_date
 #now()
@@ -38,7 +52,7 @@ TEXTE=`echo "$TEXTE" | sed "s/'/\\\\\\'/g ; s@/@\\\\\/@g ; s@\\&@et@g"`
 
 # recapitulatif
 echo "hostname = $HOSTNAME"
-echo "user = $SUDO_USER"
+echo "user = $_USER"
 echo "IP = $IP"
 echo "begin date = $BEGIN_YEAR $BEGIN_DATE"
 echo "details = $TEXTE"
@@ -50,15 +64,15 @@ read enter
 if (test -x /usr/bin/git); then
     cd /etc/
     git add .
-    GIT_COMMIT=$(git commit -a -m "$TEXTE" --author="$SUDO_USER <$SUDO_USER@evolix.net>")
+    GIT_COMMIT=$(git commit -a -m "$TEXTE" --author="$_USER <$_USER@evolix.net>")
 fi
 
 echo "
 INSERT INTO evomaint(hostname,userid,ipaddress,begin_date,end_date,details)
-VALUES ('$HOSTNAME','$SUDO_USER','$IP','$BEGIN_YEAR $BEGIN_DATE',now(),'$TEXTE') " | \
+VALUES ('$HOSTNAME','$_USER','$IP','$BEGIN_YEAR $BEGIN_DATE',now(),'$TEXTE') " | \
 psql $PGDB $PGTABLE -h $PGHOST
 
 cat /usr/share/scripts/evomaintenance.tpl | \
-    sed -e "s/__TO__/$EVOMAINTMAIL/ ; s/__HOSTNAME__/$HOSTNAME/ ; s/__USER__/$SUDO_USER/ ; s/__BEGIN_DATE__/$BEGIN_YEAR $BEGIN_DATE/ ; s/__TEXTE__/$TEXTE/ ; s/__IP__/$IP/ ; s/__FULLFROM__/$FULLFROM/ ; s/__FROM__/$FROM/ ; s/__URGENCYFROM__/$URGENCYFROM/ ; s/__URGENCYTEL__/$URGENCYTEL/"| \
+    sed -e "s/__TO__/$EVOMAINTMAIL/ ; s/__HOSTNAME__/$HOSTNAME/ ; s/__USER__/$_USER/ ; s/__BEGIN_DATE__/$BEGIN_YEAR $BEGIN_DATE/ ; s/__TEXTE__/$TEXTE/ ; s/__IP__/$IP/ ; s/__FULLFROM__/$FULLFROM/ ; s/__FROM__/$FROM/ ; s/__URGENCYFROM__/$URGENCYFROM/ ; s/__URGENCYTEL__/$URGENCYTEL/"| \
         $SENDMAIL -oi -t -f $FROM