diff -Naur nxserver/NX/scripts/setup/nxserver nxserver-magellan/NX/scripts/setup/nxserver
--- nxserver/NX/scripts/setup/nxserver	2010-12-21 13:18:13.000000000 +0100
+++ nxserver-magellan/NX/scripts/setup/nxserver	2010-12-23 19:33:03.000000000 +0100
@@ -98,6 +98,12 @@
     return 0
   fi
 
+  if [ -f /etc/mageversion ];
+  then
+    system=magellan
+    return 0
+  fi
+
   return 1
 }
 
@@ -1957,6 +1963,9 @@
     elif [ "$system" = "mandrake" ];
     then
       detectedSystem="Mandriva"
+    elif [ "$system" = "magellan" ];
+    then
+      detectedSystem="Magellan-Linux"
     fi
 
     printMsg "Autodetected system: $detectedSystem"
@@ -2171,6 +2180,7 @@
   echo "                    Xandros Desktop 4.1/Xandros Server 2.0 etc."
   echo "       solaris      Sun Solaris 10.0 etc."
   echo "       fedora       Fedora 10/11/12/13 etc."
+  echo "       magellan     Magellan-Linux 0.8.x/0.9.x/0.10.x etc."
 
   echo "$errMsg"
 
@@ -2309,6 +2319,7 @@
       "debian"             ) ;;
       "solaris"            ) ;;
       "macosx"             ) ;;
+      "magellan"             ) ;;
       ""                   ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unable to autodetect the operating system type, please specify it" ;;
       *                    ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unsupported operating system '$system'" ;;
     esac
@@ -2447,6 +2458,7 @@
 /etc/debian_release
 /etc/fedora-release
 /etc/gentoo-release
+/etc/mageversion
 /etc/immunix-release
 knoppix_version
 /etc/lfs-release
@@ -3333,6 +3345,12 @@
 
 removeNXinit () {
 
+  # do nothing on magellan
+  if [ "$system" = "magellan" ];
+  then
+     return
+  fi
+
   if [ "$system" = "fedora" ] || [ "$system" = "redhat" ] || [ "$system" = "suse" ];
   then
     if [ -f "/sbin/chkconfig" ];
@@ -3537,6 +3555,12 @@
 
 addNXinit () {
 
+ # do nothing on magellan
+ if [ "$system" = "magellan" ];
+ then
+    return
+ fi
+
  runCommand "cat '$NX_ROOT/scripts/init/nxserver' > /etc/init.d/nxserver" "Unable to create: /etc/init.d/nxserver" "warn"
  runCommand "chmod +x /etc/init.d/nxserver" "Cannot set permissions of /etc/init.d/nxserver file" "warn"
 
@@ -5744,19 +5768,6 @@
   checkETCDirectory
   makeNXConfig
 
-  checkNxhtdUserExist
-  if [ "x$?" = "x0" ];
-  then
-    if [ "$system" != "solaris" ];
-    then
-      addNxhtdUserLinux
-    else
-      addNxhtdUserSolaris
-    fi
-  else
-    printMsg "User 'nxhtd' already exists" "onlylog"
-  fi
-
   setShell
   genNXUsersKeys
   makeNXConfigServer
@@ -6751,6 +6762,12 @@
 
 addNxhtdUserLinux () {
 
+  # simply abort if the user exist. on magellan this user is already created.
+  if id nxhtd > /dev/null 2>&1
+  then
+     return
+  fi
+
   checkNxhtdGroupExist
   if [ "x$?" = "x0" ];
   then