diff --git a/dbcon/mysql/Makefile.am b/dbcon/mysql/Makefile.am
index de4143c93..8b8050158 100644
--- a/dbcon/mysql/Makefile.am
+++ b/dbcon/mysql/Makefile.am
@@ -24,8 +24,8 @@ libcalmysql_la_LDFLAGS = -version-info 1:0:0 $(idb_common_ldflags) $(idb_common_
 libcalmysql_la_CPPFLAGS = -I/usr/include/libxml2 -I../../../mysql/include -I../../../mysql/sql -I../../../mysql/regex -DMYSQL_DYNAMIC_PLUGIN $(AM_CPPFLAGS)
 include_HEADERS = idb_mysql.h
 
-dist_mysql_DATA = syscatalog_mysql.sql dumpcat_mysql.sql calsetuserpriority.sql calremoveuserpriority.sql calshowprocesslist.sql my.cnf
-mysql-Columnstore = install_calpont_mysql.sh mysql-Calpont dumpcat.pl
+dist_mysql_DATA = syscatalog_mysql.sql dumpcat_mysql.sql calsetuserpriority.sql calremoveuserpriority.sql calshowprocesslist.sql
+mysql-Columnstore = install_calpont_mysql.sh mysql-Columnstore dumpcat.pl my.cnf
 
 test:
 
diff --git a/dbcon/mysql/Makefile.in b/dbcon/mysql/Makefile.in
index f1ab264c3..8c1e80add 100644
--- a/dbcon/mysql/Makefile.in
+++ b/dbcon/mysql/Makefile.in
@@ -254,8 +254,8 @@ libcalmysql_la_SOURCES = ha_calpont.cpp ha_calpont_impl.cpp ha_calpont_dml.cpp h
 libcalmysql_la_LDFLAGS = -version-info 1:0:0 $(idb_common_ldflags) $(idb_common_libs) $(idb_write_libs) $(AM_LDFLAGS)
 libcalmysql_la_CPPFLAGS = -I/usr/include/libxml2 -I../../../mysql/include -I../../../mysql/sql -I../../../mysql/regex -DMYSQL_DYNAMIC_PLUGIN $(AM_CPPFLAGS)
 include_HEADERS = idb_mysql.h
-dist_mysql_DATA = syscatalog_mysql.sql dumpcat_mysql.sql calsetuserpriority.sql calremoveuserpriority.sql calshowprocesslist.sql my.cnf
-mysql-Columnstore = install_calpont_mysql.sh mysql-Calpont dumpcat.pl
+dist_mysql_DATA = syscatalog_mysql.sql dumpcat_mysql.sql calsetuserpriority.sql calremoveuserpriority.sql calshowprocesslist.sql
+mysql-Columnstore = install_calpont_mysql.sh mysql-Columnstore dumpcat.pl my.cnf
 all: all-am
 
 .SUFFIXES:
diff --git a/oam/install_scripts/post-mysqld-install b/oam/install_scripts/post-mysqld-install
index adefbc70b..8193edbbf 100755
--- a/oam/install_scripts/post-mysqld-install
+++ b/oam/install_scripts/post-mysqld-install
@@ -28,12 +28,12 @@ for arg in "$@"; do
 	fi
 done
 
-cd $installdir/mysql/lib64
+cd $installdir/mysql/lib
 for file in libmysqlclient libmysqlclient_r; do
 	ln -sf $file.so.18.0.0 $file.so
 	ln -sf $file.so.18.0.0 $file.so.18
 done
-cd $installdir/mysql/lib64/mysql/plugin
+cd $installdir/mysql/lib/plugin
 for file in ha_archive ha_blackhole ha_federated ha_innodb; do
 	ln -sf $file.so $file.so.0
 done
@@ -68,7 +68,7 @@ fi
 test -x /usr/local/bin/idb-testing-mysql-pre-start && /usr/local/bin/idb-testing-mysql-pre-start $installdir/mysql
 
 ### Don't give the user the notes, we'll fix them ourselves...
-$installdir/mysql/bin/mysql_install_db --rpm --user=$user --defaults-file=$installdir/mysql/my.cnf --basedir=$installdir/mysql >/dev/null
+$installdir/mysql/scripts/mysql_install_db --rpm --user=$user --defaults-file=$installdir/mysql/my.cnf --basedir=$installdir/mysql >/dev/null
 # Change permissions again to fix any new files.
 chown -R $user:$user $mysql_datadir
 
@@ -93,7 +93,7 @@ fi
 
 if [ -n "$libcalmysql" ]; then
 
-	cd $installdir/mysql/lib64/mysql/plugin
+	cd $installdir/mysql/lib/plugin
 	ln -sf $libcalmysql libcalmysql.so
         ln -sf $libcalmysql libcalmysqlent.so
 	ln -sf $libudfsdk libudf_mysql.so