diff --git a/debian/mariadb-plugin-columnstore.install b/debian/mariadb-plugin-columnstore.install
index c7a98e77820..dcd85a3c204 100644
--- a/debian/mariadb-plugin-columnstore.install
+++ b/debian/mariadb-plugin-columnstore.install
@@ -5,7 +5,7 @@ etc/columnstore/ErrorMessage.txt
 etc/columnstore/MessageFile.txt
 etc/columnstore/ProcessConfig.xml
 etc/columnstore/storagemanager.cnf
-etc/mysql/conf.d/columnstore.cnf
+etc/mysql/mariadb.conf.d/columnstore.cnf
 usr/bin/DDLProc
 usr/bin/DMLProc
 usr/bin/ExeMgr
@@ -79,7 +79,6 @@ usr/bin/smcat
 usr/bin/smls
 usr/bin/smput
 usr/bin/smrm
-usr/bin/softwareReport.sh
 usr/bin/startupTests.sh
 usr/bin/viewtablelock
 usr/bin/workernode
diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore
index 1c3ddb8ed70..3cfbda3ad30 160000
--- a/storage/columnstore/columnstore
+++ b/storage/columnstore/columnstore
@@ -1 +1 @@
-Subproject commit 1c3ddb8ed7028f09ef8e53a54580629f482942ff
+Subproject commit 3cfbda3ad30cd9c759f5a24dd8be66586faa56d9