diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index ab40f1c2e..565d43243 100644
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -937,6 +937,7 @@ eventlog => {
     types => {
 	recid => 'INTEGER AUTO_INCREMENT',  
     },
+    tablespace =>'XCATTBS32K',
     table_desc => 'Stores the events occurred.',  
     descriptions => {
         recid => 'The record id.',
@@ -962,6 +963,7 @@ auditlog => {
     types => {
 	recid => 'INTEGER AUTO_INCREMENT',  
     },
+    tablespace =>'XCATTBS32K',
     table_desc => ' Audit Data log.',  
     descriptions => {
         recid => 'The record id.',
diff --git a/perl-xCAT/xCAT/Table.pm b/perl-xCAT/xCAT/Table.pm
index 20c308a45..0e5e66271 100644
--- a/perl-xCAT/xCAT/Table.pm
+++ b/perl-xCAT/xCAT/Table.pm
@@ -480,6 +480,12 @@ sub buildcreatestmt
        if ($xcatcfg =~ /^mysql:/) {  #for mysql
 	  $retv .= " ENGINE=$descr->{engine} ";
        }
+    }
+    # allow tablespace change for DB2 
+    if ($descr->{tablespace}) {
+       if ($xcatcfg =~ /^DB2:/) {  #for DB2 
+	  $retv .= " in $descr->{tablespace} ";
+       }
     }
 	#print "retv=$retv\n";
     return $retv;