diff --git a/ChangeLog b/ChangeLog
index 09ae291c..ddd6e121 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@ $Id$
 
 v0.83.21	10-Jun-2006
 
+	install:
+		The checkbasic script uses more tricks to see if you are mbse
+		su to root before install.
+
 	mbsetup:
 		In nodes setup added check for paths when directory sessions
 		are selected.
diff --git a/checkbasic b/checkbasic
index 9fb1290d..839a842a 100755
--- a/checkbasic
+++ b/checkbasic
@@ -12,6 +12,13 @@
 if [ "`grep mbse: /etc/passwd`" != "" ]; then
   if [ "`grep bbs: /etc/group`" != "" ]; then
     if [ -n "$MBSE_ROOT" ]; then
+      if [ "$LOGNAME" = "root" ]; then
+	#
+	# Newer su versions change logname when su to root without
+	# environment change. Try to fix LOGNAME variable.
+	#
+	export LOGNAME="`who am i | awk -F ' ' '{ print $1 }'`"
+      fi
       if [ "$LOGNAME" = "mbse" ]; then
         #
 	# Looks good, normal mbse user and environment is set.
@@ -39,5 +46,5 @@ else
   echo "    Make sure you are root and type ./SETUP.sh and"
   echo "    read the file INSTALL for instructions."
 fi
-
+exit 1