diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 2e03d1cfa19..d96e92a2177 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -17,6 +17,13 @@ set -e
 # building the deb packages here.
 export DEB_BUILD_OPTIONS="nocheck $DEB_BUILD_OPTIONS"
 
+# Take the files and part of control from MCS directory
+if [[ -d storage/columnstore/columnstore/debian ]]; then
+  cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
+  echo >> debian/control
+  cat storage/columnstore/columnstore/debian/control >> debian/control
+fi
+
 # General CI optimizations to keep build output smaller
 if [[ $TRAVIS ]] || [[ $GITLAB_CI ]]
 then
diff --git a/debian/control b/debian/control
index 1f2a8a2878e..8d758ef1d90 100644
--- a/debian/control
+++ b/debian/control
@@ -591,25 +591,6 @@ Description: RocksDB storage engine for MariaDB
  at maximising storage efficiency while maintaining InnoDB-like performance.
  This package contains the RocksDB plugin for MariaDB.
 
-Package: mariadb-plugin-columnstore
-Architecture: amd64 i386
-Depends: binutils,
-         libjemalloc1 | libjemalloc2,
-         libsnappy1 | libsnappy1v5,
-         mariadb-server-10.5 (= ${binary:Version}),
-         net-tools,
-         python3,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: mariadb-columnstore-libs,
-        mariadb-columnstore-platform
-Replaces: mariadb-columnstore-libs,
-          mariadb-columnstore-platform
-Description: MariaDB ColumnStore storage engine
- The MariaDB ColumnStore storage engine is a high-performance columnar
- analytical engine, aimed at rapid processing of analytical queries on very
- large amounts of data.
-
 Package: mariadb-plugin-oqgraph
 Architecture: any
 Depends: libjudydebian1,
diff --git a/debian/mariadb-plugin-columnstore.install b/debian/mariadb-plugin-columnstore.install
deleted file mode 100644
index f519fa2a37e..00000000000
--- a/debian/mariadb-plugin-columnstore.install
+++ /dev/null
@@ -1,160 +0,0 @@
-etc/columnstore/AlarmConfig.xml
-etc/columnstore/Columnstore.xml
-etc/columnstore/ConsoleCmds.xml
-etc/columnstore/ErrorMessage.txt
-etc/columnstore/MessageFile.txt
-etc/columnstore/ProcessConfig.xml
-etc/columnstore/storagemanager.cnf
-etc/mysql/mariadb.conf.d/columnstore.cnf
-usr/bin/DDLProc
-usr/bin/DMLProc
-usr/bin/ExeMgr
-usr/bin/MCSInstanceCmds.sh
-usr/bin/MCSVolumeCmds.sh
-usr/bin/MCSgetCredentials.sh
-usr/bin/PrimProc
-usr/bin/ProcMgr
-usr/bin/ProcMon
-usr/bin/ServerMonitor
-usr/bin/StorageManager
-usr/bin/WriteEngineServer
-usr/bin/autoConfigure
-usr/bin/bulklogReport.sh
-usr/bin/clearShm
-usr/bin/cleartablelock
-usr/bin/columnstore
-usr/bin/columnstore-post-install
-usr/bin/columnstore-pre-uninstall
-usr/bin/columnstoreClusterTester.sh
-usr/bin/columnstoreDBWrite
-usr/bin/columnstoreSupport
-usr/bin/columnstoreSyslogSetup.sh
-usr/bin/columnstore_installer
-usr/bin/columnstore_module_installer.sh
-usr/bin/columnstore_os_check.sh
-usr/bin/columnstore_run.sh
-usr/bin/colxml
-usr/bin/configReport.sh
-usr/bin/configxml.sh
-usr/bin/controllernode
-usr/bin/cpimport
-usr/bin/cpimport.bin
-usr/bin/cplogger
-usr/bin/dbbuilder
-usr/bin/dbmsReport.sh
-usr/bin/dbrmctl
-usr/bin/ddlcleanup
-usr/bin/disable-rep-columnstore.sh
-usr/bin/editem
-usr/bin/getMySQLpw
-usr/bin/hardwareReport.sh
-usr/bin/idbmeminfo
-usr/bin/load_brm
-usr/bin/logReport.sh
-usr/bin/mariadb-columnstore-start.sh
-usr/bin/mariadb-columnstore-stop.sh
-usr/bin/mariadb-command-line.sh
-usr/bin/master-rep-columnstore.sh
-usr/bin/mcs-savebrm.py
-usr/bin/mcs-loadbrm.py
-usr/bin/mcs-stop-controllernode.sh
-usr/bin/mcsGetConfig
-usr/bin/mcsSetConfig
-usr/bin/mcs_module_installer.sh
-usr/bin/mycnfUpgrade
-usr/bin/os_detect.sh
-usr/bin/post-mysql-install
-usr/bin/post-mysqld-install
-usr/bin/postConfigure
-usr/bin/quick_installer_multi_server.sh
-usr/bin/quick_installer_single_server.sh
-usr/bin/remote_command.sh
-usr/bin/remote_command_verify.sh
-usr/bin/remote_scp_get.sh
-usr/bin/remote_scp_put.sh
-usr/bin/remotessh.exp
-usr/bin/reset_locks
-usr/bin/resourceReport.sh
-usr/bin/rollback
-usr/bin/rsync.sh
-usr/bin/save_brm
-usr/bin/slave-rep-columnstore.sh
-usr/bin/smcat
-usr/bin/smls
-usr/bin/smput
-usr/bin/smrm
-usr/bin/startupTests.sh
-usr/bin/viewtablelock
-usr/bin/workernode
-usr/lib/*/libalarmmanager.so
-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/*/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/*/libmessageqcpp.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/*/libthrift.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/columnstoreAlias
-usr/share/columnstore/columnstoreLogRotate
-usr/share/columnstore/columnstoreSyslog
-usr/share/columnstore/columnstoreSyslog-ng
-usr/share/columnstore/columnstoreSyslog7
-usr/share/columnstore/columnstore_functions
-usr/share/columnstore/columnstore_info.sql
-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-exemgr.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/mcstest-001.sh
-usr/share/columnstore/mcstest-002.sh
-usr/share/columnstore/mcstest-003.sh
-usr/share/columnstore/mcstest-004.sh
-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
diff --git a/debian/mariadb-plugin-columnstore.postinst b/debian/mariadb-plugin-columnstore.postinst
deleted file mode 100644
index 97a1bba22c8..00000000000
--- a/debian/mariadb-plugin-columnstore.postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Install ColumnStore
-columnstore-post-install install
-
-#DEBHELPER#
diff --git a/debian/mariadb-plugin-columnstore.postrm b/debian/mariadb-plugin-columnstore.postrm
deleted file mode 100644
index b2e19774ec1..00000000000
--- a/debian/mariadb-plugin-columnstore.postrm
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "$1" = "purge" ]; then
-    rm -rf /var/lib/columnstore
-    rm -rf /etc/columnstore
-    rm -f /etc/mysql/mariadb.conf.d/columnstore.cnf.rpmsave
-fi
-
-# Automatically restart MariaDB after ColumnStore plugin has been removed
-case "$1" in
-  purge|remove|disappear)
-    if [ -d /run/systemd/system ]; then
-      # If systemd
-      deb-systemd-invoke restart mariadb.service >/dev/null
-    elif [ -x "/etc/init.d/mariadb" ]; then
-      # Fall-back to SysV init
-      invoke-rc.d mariadb restart || exit $?
-    fi
-  ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/mariadb-plugin-columnstore.prerm b/debian/mariadb-plugin-columnstore.prerm
deleted file mode 100644
index f6a27f14499..00000000000
--- a/debian/mariadb-plugin-columnstore.prerm
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-
-columnstore-pre-uninstall
-
-
-#DEBHELPER#
diff --git a/debian/mariadb-plugin-columnstore.triggers b/debian/mariadb-plugin-columnstore.triggers
deleted file mode 100644
index dd866036784..00000000000
--- a/debian/mariadb-plugin-columnstore.triggers
+++ /dev/null
@@ -1 +0,0 @@
-activate-noawait ldconfig
diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore
index 86347532abf..a91c4d00d93 160000
--- a/storage/columnstore/columnstore
+++ b/storage/columnstore/columnstore
@@ -1 +1 @@
-Subproject commit 86347532abf1f7dae8896a96d5b7251233fca229
+Subproject commit a91c4d00d931b2e7dacc4f3ad6070906ddefff14