diff --git a/build/columnstore.spec.in b/build/columnstore.spec.in
index 22eadecb5..b1d847772 100644
--- a/build/columnstore.spec.in
+++ b/build/columnstore.spec.in
@@ -370,7 +370,7 @@ prefix=/usr/local
 
 test -x /usr/local/MariaDB/Columnstore/bin/post-install && /usr/local/MariaDB/Columnstore/bin/post-install --prefix=$prefix --rpmmode=$rpmmode
 
-echo "InfinIDB RPM install completed"
+echo "MariaDB ColumnStore RPM install completed"
 
 %post libs
 rpmmode=install
@@ -382,7 +382,7 @@ fi
 
 prefix=/usr/local
 
-echo "InfinIDB RPM install completed"
+echo "MariaDB ColumnStore RPM install completed"
 
 %post storage-engine
 rpmmode=install
@@ -394,7 +394,7 @@ fi
 
 prefix=/usr/local
 
-echo "InfinIDB RPM install completed"
+echo "MariaDB ColumnStore RPM install completed"
 
 
 %post enterprise
@@ -407,7 +407,7 @@ fi
 
 prefix=/usr/local
 
-echo "InfinIDB RPM install completed"
+echo "MariaDB ColumnStore RPM install completed"
 
 %preun platform
 rpmmode=upgrade
diff --git a/dbcon/mysql/install_calpont_mysql.sh b/dbcon/mysql/install_calpont_mysql.sh
index 7f5fae72b..acf8cefee 100755
--- a/dbcon/mysql/install_calpont_mysql.sh
+++ b/dbcon/mysql/install_calpont_mysql.sh
@@ -28,6 +28,8 @@ done
 df=$installdir/mysql/my.cnf
 
 $installdir/mysql/bin/mysql --defaults-file=$df --force --user=root $pwprompt mysql 2>/tmp/mysql_install.log <<EOD
+INSTALL PLUGIN columnstore SONAME 'libcalmysql.so';
+$installdir/mysql/bin/mysql --defaults-file=$df --force --user=root $pwprompt mysql 2>>/tmp/mysql_install.log <<EOD
 INSTALL PLUGIN infinidb SONAME 'libcalmysql.so';
 -- these are deprecated names
 DELETE FROM mysql.func WHERE name='caldisablepartition';