diff --git a/perl-xCAT-2.0/xCAT/Client.pm b/perl-xCAT-2.0/xCAT/Client.pm
index 6949797b5..103b87f52 100644
--- a/perl-xCAT-2.0/xCAT/Client.pm
+++ b/perl-xCAT-2.0/xCAT/Client.pm
@@ -3,7 +3,7 @@
 package xCAT::Client;
 BEGIN
 {
-  $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
+  $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr';
 }
 use lib "$::XCATROOT/lib/perl";
 use xCAT::NodeRange;
diff --git a/perl-xCAT-2.0/xCAT/DSHCLI.pm b/perl-xCAT-2.0/xCAT/DSHCLI.pm
index 472b6d674..4d89762e5 100644
--- a/perl-xCAT-2.0/xCAT/DSHCLI.pm
+++ b/perl-xCAT-2.0/xCAT/DSHCLI.pm
@@ -3602,8 +3602,10 @@ sub parse_and_run_dsh
     if ($ENV{'XCATROOT'})
     {
        $::XCATROOT = $ENV{'XCATROOT'};  # setup xcatroot home directory
-    } else {
+    } elsif (-d '/opt/xcat') {
        $::XCATROOT = "/opt/xcat";
+    } else {
+       $::XCATROOT = "/usr";
     }
     
     # parse the arguments
diff --git a/perl-xCAT-2.0/xCAT/NotifHandler.pm b/perl-xCAT-2.0/xCAT/NotifHandler.pm
index b31c8347f..445e7f0d4 100644
--- a/perl-xCAT-2.0/xCAT/NotifHandler.pm
+++ b/perl-xCAT-2.0/xCAT/NotifHandler.pm
@@ -3,7 +3,7 @@
 package xCAT::NotifHandler;
 BEGIN
 {
-    $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
+    $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr';
 }
 use lib "$::XCATROOT/lib/perl";
 
diff --git a/perl-xCAT-2.0/xCAT/Table.pm b/perl-xCAT-2.0/xCAT/Table.pm
index 053ddd5ea..679bb668e 100644
--- a/perl-xCAT-2.0/xCAT/Table.pm
+++ b/perl-xCAT-2.0/xCAT/Table.pm
@@ -9,7 +9,7 @@
 package xCAT::Table;
 BEGIN
 {
-    $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
+    $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr';
 }
 use lib "$::XCATROOT/lib/perl";