diff --git a/build/bootstrap_mcs.sh b/build/bootstrap_mcs.sh
index a7846c933..cc570a57b 100755
--- a/build/bootstrap_mcs.sh
+++ b/build/bootstrap_mcs.sh
@@ -506,6 +506,7 @@ build_package() {
 
     echo "Building a package for $OS"
     echo "Build command: $command"
+    # eval "$prereq"
     eval "$command"
 
     check_errorcode
diff --git a/cmake/ColumnstoreLibrary.cmake b/cmake/ColumnstoreLibrary.cmake
index 18d69acad..13a6097d6 100644
--- a/cmake/ColumnstoreLibrary.cmake
+++ b/cmake/ColumnstoreLibrary.cmake
@@ -82,6 +82,16 @@ macro(columnstore_shared_library libname)
     columnstore_install_target(${libname} ${ENGINE_LIBDIR})
 endmacro()
 
+macro(columnstore_static_library libname)
+    add_definitions(-fPIC -DPIC)
+    add_library(${libname} STATIC ${ARGN})
+endmacro()
+
+macro(columnstore_shared_library libname)
+    add_library(${libname} SHARED ${ARGN})
+    columnstore_install_target(${libname} ${ENGINE_LIBDIR})
+endmacro()
+
 macro(columnstore_library libname)
     if(COLUMNSTORE_STATIC_LIBRARIES)
         columnstore_static_library(${libname} ${ARGN})
@@ -90,6 +100,11 @@ macro(columnstore_library libname)
     endif()
 endmacro()
 
+macro(columnstore_mysql_plugin_library libname)
+    add_library(${libname} SHARED ${ARGN})
+    columnstore_install_target(${libname} ${MARIADB_PLUGINDIR})
+endmacro()
+
 macro(columnstore_link libname)
     target_link_libraries(${libname} ${ARGN})
 endmacro()
diff --git a/debian/mariadb-plugin-columnstore.install b/debian/mariadb-plugin-columnstore.install
deleted file mode 100644
index 974e41889..000000000
--- a/debian/mariadb-plugin-columnstore.install
+++ /dev/null
@@ -1,122 +0,0 @@
-etc/columnstore/Columnstore.xml
-etc/columnstore/ErrorMessage.txt
-etc/columnstore/MessageFile.txt
-etc/columnstore/storagemanager.cnf
-etc/mysql/mariadb.conf.d/columnstore.cnf
-usr/bin/clearShm
-usr/bin/cleartablelock
-usr/bin/columnstore_run.sh
-usr/bin/columnstore-post-install
-usr/bin/columnstore-pre-uninstall
-usr/bin/columnstoreDBWrite
-usr/bin/columnstoreSyslogSetup.sh
-usr/bin/colxml
-usr/bin/controllernode
-usr/bin/cpimport
-usr/bin/cpimport.bin
-usr/bin/cplogger
-usr/bin/cskeys
-usr/bin/cspasswd
-usr/bin/dbbuilder
-usr/bin/dbrmctl
-usr/bin/ddlcleanup
-usr/bin/DDLProc
-usr/bin/DMLProc
-usr/bin/editem
-usr/bin/idbmeminfo
-usr/bin/load_brm
-usr/bin/loop_process_starter.sh
-usr/bin/mariadb-columnstore-start.sh
-usr/bin/mariadb-columnstore-stop.sh
-usr/bin/mcs-load-brm-from-file
-usr/bin/mcs-load-em
-usr/bin/mcs-loadbrm.py
-usr/bin/mcs-oid-client
-usr/bin/mcs-savebrm.py
-usr/bin/mcs-shmem-locks
-usr/bin/mcs-stop-controllernode.sh
-usr/bin/mcsGetConfig
-usr/bin/mcsRebuildEM
-usr/bin/mcsSetConfig
-usr/bin/mycnfUpgrade
-usr/bin/post-mysql-install
-usr/bin/post-mysqld-install
-usr/bin/PrimProc
-usr/bin/reset_locks
-usr/bin/rollback
-usr/bin/save_brm
-usr/bin/smcat
-usr/bin/smkill
-usr/bin/smls
-usr/bin/smps
-usr/bin/smput
-usr/bin/smrm
-usr/bin/StorageManager
-usr/bin/testS3Connection
-usr/bin/viewtablelock
-usr/bin/workernode
-usr/bin/WriteEngineServer
-usr/lib/*/libbatchloader.so
-usr/lib/*/libbrm.so
-usr/lib/*/libcacheutils.so
-usr/lib/*/libcloudio.so
-usr/lib/*/libcommon.so
-usr/lib/*/libcompress.so
-usr/lib/*/libconfigcpp.so
-usr/lib/*/libdataconvert.so
-usr/lib/*/libdatatypes.so
-usr/lib/*/libddlcleanuputil.so
-usr/lib/*/libddlpackage.so
-usr/lib/*/libddlpackageproc.so
-usr/lib/*/libdmlpackage.so
-usr/lib/*/libdmlpackageproc.so
-usr/lib/*/libexecplan.so
-usr/lib/*/libfuncexp.so
-usr/lib/*/libidbdatafile.so
-usr/lib/*/libjoblist.so
-usr/lib/*/libjoiner.so
-usr/lib/*/liblibmysql_client.so
-usr/lib/*/libloggingcpp.so
-usr/lib/*/libmarias3.so
-usr/lib/*/liboamcpp.so
-usr/lib/*/libquerystats.so
-usr/lib/*/libquerytele.so
-usr/lib/*/libregr.so
-usr/lib/*/librowgroup.so
-usr/lib/*/librwlock.so
-usr/lib/*/libstoragemanager.so
-usr/lib/*/libthreadpool.so
-usr/lib/*/libudfsdk.so
-usr/lib/*/libwindowfunction.so
-usr/lib/*/libwriteengine.so
-usr/lib/*/libwriteengineclient.so
-usr/lib/*/libwriteengineredistribute.so
-usr/lib/mysql/plugin/ha_columnstore.so
-usr/lib/mysql/plugin/libregr_mysql.so
-usr/lib/mysql/plugin/libudf_mysql.so
-usr/sbin/install_mcs_mysql.sh
-usr/share/columnstore/calremoveuserpriority.sql
-usr/share/columnstore/calsetuserpriority.sql
-usr/share/columnstore/calshowprocesslist.sql
-usr/share/columnstore/columnstore_info.sql
-usr/share/columnstore/columnstoreAlias
-usr/share/columnstore/columnstoreLogRotate
-usr/share/columnstore/columnstoreSyslog
-usr/share/columnstore/columnstoreSyslog-ng
-usr/share/columnstore/columnstoreSyslog7
-usr/share/columnstore/dumpcat_mysql.sql
-usr/share/columnstore/gitversionEngine
-usr/share/columnstore/mariadb-columnstore.service
-usr/share/columnstore/mcs-controllernode.service
-usr/share/columnstore/mcs-ddlproc.service
-usr/share/columnstore/mcs-dmlproc.service
-usr/share/columnstore/mcs-loadbrm.service
-usr/share/columnstore/mcs-primproc.service
-usr/share/columnstore/mcs-storagemanager.service
-usr/share/columnstore/mcs-workernode.service
-usr/share/columnstore/mcs-writeengineserver.service
-usr/share/columnstore/myCnf-exclude-args.text
-usr/share/columnstore/myCnf-include-args.text
-usr/share/columnstore/releasenum
-usr/share/columnstore/syscatalog_mysql.sql
-var/lib/columnstore/local/module