diff --git a/build/build_rpms b/build/build_rpms
index 37582910e..4950f4582 100755
--- a/build/build_rpms
+++ b/build/build_rpms
@@ -54,10 +54,10 @@ tar -cf - --exclude 'export/include' --exclude 'export/*.tar' export | tar -C $b
 mv $buildroot/export $buildroot/Calpont
 
 #get mysql server files
-#pushd $mysqldir > /dev/null
-#mkdir -p $buildroot/Calpont/mysql
-#cpio -pdmu --quiet $buildroot/Calpont/mysql < files.lst
-#popd >/dev/null
+pushd $mysqldir > /dev/null
+mkdir -p $buildroot/Calpont/mysql
+cpio -pdmu --quiet $buildroot/Calpont/mysql < files.lst
+popd >/dev/null
 
 #clean up some files from buildroot
 rm -f $buildroot/Calpont/etc/Doxyfile
diff --git a/build/files.lst b/build/files.lst
index 19788d1e5..2a063ac54 100644
--- a/build/files.lst
+++ b/build/files.lst
@@ -1,121 +1,3 @@
-./lib/mysql/libmysqlclient.so.16.0.0
-./lib/mysql/libmysqlclient_r.so.16.0.0
-./lib/mysql/plugin/ha_federated.so.0.0.0
-./lib/mysql/plugin/ha_blackhole.so.0.0.0
-./lib/mysql/plugin/ha_archive.so.0.0.0
-./lib/mysql/plugin/ha_innodb.so.0.0.0
-./lib/mysql/plugin/ha_innodb_plugin.so.0.0.0
-./libexec/mysqlmanager
-./libexec/mysqld
-./bin/mysql_find_rows
-./bin/mysqlbug
-./bin/innochecksum
-./bin/mysql_secure_installation
-./bin/resolve_stack_dump
-./bin/my_print_defaults
-./bin/mysql_waitpid
-./bin/resolveip
-./bin/perror
-./bin/myisamlog
-./bin/mysql
-./bin/myisamchk
-./bin/mysql_fix_privilege_tables
-./bin/mysql_upgrade
-./bin/mysqlcheck
-./bin/myisampack
-./bin/mysql_setpermission
-./bin/mysqladmin
-./bin/mysqlslap
-./bin/mysql_zap
-./bin/mysqldump
-./bin/mysqld_safe
-./bin/mysqlshow
-./bin/mysqltest
-./bin/mysql_config
-./bin/mysql_client_test
-./bin/mysqlbinlog
-./bin/mysqld_multi
-./bin/mysqlaccess
-./bin/mysql_install_db
-./bin/msql2mysql
-./bin/mysqlimport
-./bin/replace
-./bin/mysql_convert_table_format
-./bin/myisam_ftdump
-./bin/mysql_tzinfo_to_sql
-./bin/mysql_fix_extensions
-./bin/mysqldumpslow
-./bin/mysqlhotcopy
-./share/mysql/config.small.ini
-./share/mysql/romanian/errmsg.sys
-./share/mysql/korean/errmsg.sys
-./share/mysql/norwegian-ny/errmsg.sys
-./share/mysql/binary-configure
-./share/mysql/french/errmsg.sys
-./share/mysql/greek/errmsg.sys
-./share/mysql/mysql-log-rotate
-./share/mysql/mysql_system_tables_data.sql
-./share/mysql/russian/errmsg.sys
-./share/mysql/mysql.server
-./share/mysql/mi_test_all.res
-./share/mysql/danish/errmsg.sys
-./share/mysql/portuguese/errmsg.sys
-./share/mysql/mysql_fix_privilege_tables.sql
-./share/mysql/italian/errmsg.sys
-./share/mysql/mi_test_all
-./share/mysql/mysql_system_tables.sql
-./share/mysql/my-innodb-heavy-4G.cnf
-./share/mysql/norwegian/errmsg.sys
-./share/mysql/fill_help_tables.sql
-./share/mysql/spanish/errmsg.sys
-./share/mysql/ndb-config-2-node.ini
-./share/mysql/slovak/errmsg.sys
-./share/mysql/mysql_test_data_timezone.sql
-./share/mysql/czech/errmsg.sys
-./share/mysql/english/errmsg.sys
-./share/mysql/hungarian/errmsg.sys
-./share/mysql/mysqld_multi.server
-./share/mysql/estonian/errmsg.sys
-./share/mysql/german/errmsg.sys
-./share/mysql/errmsg.txt
-./share/mysql/swedish/errmsg.sys
-./share/mysql/dutch/errmsg.sys
-./share/mysql/charsets/cp866.xml
-./share/mysql/charsets/hebrew.xml
-./share/mysql/charsets/latin2.xml
-./share/mysql/charsets/armscii8.xml
-./share/mysql/charsets/latin7.xml
-./share/mysql/charsets/geostd8.xml
-./share/mysql/charsets/latin5.xml
-./share/mysql/charsets/swe7.xml
-./share/mysql/charsets/keybcs2.xml
-./share/mysql/charsets/cp1257.xml
-./share/mysql/charsets/macroman.xml
-./share/mysql/charsets/cp1251.xml
-./share/mysql/charsets/cp1256.xml
-./share/mysql/charsets/macce.xml
-./share/mysql/charsets/dec8.xml
-./share/mysql/charsets/latin1.xml
-./share/mysql/charsets/greek.xml
-./share/mysql/charsets/cp850.xml
-./share/mysql/charsets/hp8.xml
-./share/mysql/charsets/cp852.xml
-./share/mysql/charsets/koi8r.xml
-./share/mysql/charsets/README
-./share/mysql/charsets/cp1250.xml
-./share/mysql/charsets/koi8u.xml
-./share/mysql/charsets/Index.xml
-./share/mysql/charsets/ascii.xml
-./share/mysql/config.medium.ini
-./share/mysql/my-huge.cnf
-./share/mysql/polish/errmsg.sys
-./share/mysql/my-medium.cnf
-./share/mysql/my-large.cnf
-./share/mysql/config.huge.ini
-./share/mysql/ukrainian/errmsg.sys
-./share/mysql/serbian/errmsg.sys
-./share/mysql/my-small.cnf
-./share/mysql/japanese/errmsg.sys
 ./my.cnf
 ./mysql-Calpont
 ./install_calpont_mysql.sh
diff --git a/build/infinidb.spec.in b/build/infinidb.spec.in
index efe26f41c..2eaaf23da 100644
--- a/build/infinidb.spec.in
+++ b/build/infinidb.spec.in
@@ -348,6 +348,17 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}-%{release}
 /usr/local/Calpont/lib/libcalmysql.so.1.0.0
 /usr/local/Calpont/lib/libudf_mysql.so.1.0.0
 
+/usr/local/Calpont/mysql/mysql-Calpont
+/usr/local/Calpont/mysql/install_calpont_mysql.sh
+/usr/local/Calpont/mysql/syscatalog_mysql.sql
+/usr/local/Calpont/mysql/dumpcat_mysql.sql
+/usr/local/Calpont/mysql/dumpcat.pl
+/usr/local/Calpont/mysql/calsetuserpriority.sql
+/usr/local/Calpont/mysql/calremoveuserpriority.sql
+/usr/local/Calpont/mysql/calshowprocesslist.sql
+
+%config /usr/local/Calpont/mysql/my.cnf
+
 #
 # Scriptlets
 # for an install, pre & post run with $1 set to 1
diff --git a/dbcon/mysql/files.lst b/dbcon/mysql/files.lst
index 19788d1e5..2a063ac54 100644
--- a/dbcon/mysql/files.lst
+++ b/dbcon/mysql/files.lst
@@ -1,121 +1,3 @@
-./lib/mysql/libmysqlclient.so.16.0.0
-./lib/mysql/libmysqlclient_r.so.16.0.0
-./lib/mysql/plugin/ha_federated.so.0.0.0
-./lib/mysql/plugin/ha_blackhole.so.0.0.0
-./lib/mysql/plugin/ha_archive.so.0.0.0
-./lib/mysql/plugin/ha_innodb.so.0.0.0
-./lib/mysql/plugin/ha_innodb_plugin.so.0.0.0
-./libexec/mysqlmanager
-./libexec/mysqld
-./bin/mysql_find_rows
-./bin/mysqlbug
-./bin/innochecksum
-./bin/mysql_secure_installation
-./bin/resolve_stack_dump
-./bin/my_print_defaults
-./bin/mysql_waitpid
-./bin/resolveip
-./bin/perror
-./bin/myisamlog
-./bin/mysql
-./bin/myisamchk
-./bin/mysql_fix_privilege_tables
-./bin/mysql_upgrade
-./bin/mysqlcheck
-./bin/myisampack
-./bin/mysql_setpermission
-./bin/mysqladmin
-./bin/mysqlslap
-./bin/mysql_zap
-./bin/mysqldump
-./bin/mysqld_safe
-./bin/mysqlshow
-./bin/mysqltest
-./bin/mysql_config
-./bin/mysql_client_test
-./bin/mysqlbinlog
-./bin/mysqld_multi
-./bin/mysqlaccess
-./bin/mysql_install_db
-./bin/msql2mysql
-./bin/mysqlimport
-./bin/replace
-./bin/mysql_convert_table_format
-./bin/myisam_ftdump
-./bin/mysql_tzinfo_to_sql
-./bin/mysql_fix_extensions
-./bin/mysqldumpslow
-./bin/mysqlhotcopy
-./share/mysql/config.small.ini
-./share/mysql/romanian/errmsg.sys
-./share/mysql/korean/errmsg.sys
-./share/mysql/norwegian-ny/errmsg.sys
-./share/mysql/binary-configure
-./share/mysql/french/errmsg.sys
-./share/mysql/greek/errmsg.sys
-./share/mysql/mysql-log-rotate
-./share/mysql/mysql_system_tables_data.sql
-./share/mysql/russian/errmsg.sys
-./share/mysql/mysql.server
-./share/mysql/mi_test_all.res
-./share/mysql/danish/errmsg.sys
-./share/mysql/portuguese/errmsg.sys
-./share/mysql/mysql_fix_privilege_tables.sql
-./share/mysql/italian/errmsg.sys
-./share/mysql/mi_test_all
-./share/mysql/mysql_system_tables.sql
-./share/mysql/my-innodb-heavy-4G.cnf
-./share/mysql/norwegian/errmsg.sys
-./share/mysql/fill_help_tables.sql
-./share/mysql/spanish/errmsg.sys
-./share/mysql/ndb-config-2-node.ini
-./share/mysql/slovak/errmsg.sys
-./share/mysql/mysql_test_data_timezone.sql
-./share/mysql/czech/errmsg.sys
-./share/mysql/english/errmsg.sys
-./share/mysql/hungarian/errmsg.sys
-./share/mysql/mysqld_multi.server
-./share/mysql/estonian/errmsg.sys
-./share/mysql/german/errmsg.sys
-./share/mysql/errmsg.txt
-./share/mysql/swedish/errmsg.sys
-./share/mysql/dutch/errmsg.sys
-./share/mysql/charsets/cp866.xml
-./share/mysql/charsets/hebrew.xml
-./share/mysql/charsets/latin2.xml
-./share/mysql/charsets/armscii8.xml
-./share/mysql/charsets/latin7.xml
-./share/mysql/charsets/geostd8.xml
-./share/mysql/charsets/latin5.xml
-./share/mysql/charsets/swe7.xml
-./share/mysql/charsets/keybcs2.xml
-./share/mysql/charsets/cp1257.xml
-./share/mysql/charsets/macroman.xml
-./share/mysql/charsets/cp1251.xml
-./share/mysql/charsets/cp1256.xml
-./share/mysql/charsets/macce.xml
-./share/mysql/charsets/dec8.xml
-./share/mysql/charsets/latin1.xml
-./share/mysql/charsets/greek.xml
-./share/mysql/charsets/cp850.xml
-./share/mysql/charsets/hp8.xml
-./share/mysql/charsets/cp852.xml
-./share/mysql/charsets/koi8r.xml
-./share/mysql/charsets/README
-./share/mysql/charsets/cp1250.xml
-./share/mysql/charsets/koi8u.xml
-./share/mysql/charsets/Index.xml
-./share/mysql/charsets/ascii.xml
-./share/mysql/config.medium.ini
-./share/mysql/my-huge.cnf
-./share/mysql/polish/errmsg.sys
-./share/mysql/my-medium.cnf
-./share/mysql/my-large.cnf
-./share/mysql/config.huge.ini
-./share/mysql/ukrainian/errmsg.sys
-./share/mysql/serbian/errmsg.sys
-./share/mysql/my-small.cnf
-./share/mysql/japanese/errmsg.sys
 ./my.cnf
 ./mysql-Calpont
 ./install_calpont_mysql.sh