diff --git a/cmake/mariadb_connector_c.cmake b/cmake/mariadb_connector_c.cmake
index 0dc7722d11e..37127a13ccf 100644
--- a/cmake/mariadb_connector_c.cmake
+++ b/cmake/mariadb_connector_c.cmake
@@ -24,6 +24,8 @@ SET(CONC_WITH_MYSQLCOMPAT ON)
 
 IF (INSTALL_LAYOUT STREQUAL "RPM")
   SET(CONC_INSTALL_LAYOUT "RPM")
+ELSEIF (INSTALL_LAYOUT STREQUAL "DEB")
+  SET(CONC_INSTALL_LAYOUT "DEB")
 ELSE()
   SET(CONC_INSTALL_LAYOUT "DEFAULT")
 ENDIF()
diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install
index d4d5f50ba87..dcc002c936f 100644
--- a/debian/libmariadb-dev.install
+++ b/debian/libmariadb-dev.install
@@ -1,5 +1,6 @@
 usr/bin/mariadb_config
 usr/include/mariadb
+usr/lib/*/libmariadb.a
 usr/lib/*/libmariadb.so
 usr/lib/*/libmariadbclient.a
 usr/lib/*/libmariadbclient.so
diff --git a/debian/libmariadb3.install b/debian/libmariadb3.install
index 8636166a493..5cd0aad00e0 100644
--- a/debian/libmariadb3.install
+++ b/debian/libmariadb3.install
@@ -1,5 +1,6 @@
 usr/lib/*/libmariadb.so.*
-usr/lib/mysql/plugin/client_ed25519.so
-usr/lib/mysql/plugin/dialog.so
-usr/lib/mysql/plugin/mysql_clear_password.so
-usr/lib/mysql/plugin/sha256_password.so
+usr/lib/*/libmariadb3/plugin/caching_sha2_password.so
+usr/lib/*/libmariadb3/plugin/client_ed25519.so
+usr/lib/*/libmariadb3/plugin/dialog.so
+usr/lib/*/libmariadb3/plugin/mysql_clear_password.so
+usr/lib/*/libmariadb3/plugin/sha256_password.so
diff --git a/debian/mariadb-plugin-gssapi-client.install b/debian/mariadb-plugin-gssapi-client.install
index 5a089e9352e..4486070ffa8 100644
--- a/debian/mariadb-plugin-gssapi-client.install
+++ b/debian/mariadb-plugin-gssapi-client.install
@@ -1 +1 @@
-usr/lib/mysql/plugin/auth_gssapi_client.so
+usr/lib/*/libmariadb3/plugin/auth_gssapi_client.so
diff --git a/debian/rules b/debian/rules
index d8ab4c5185b..3d453c55ce6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -143,6 +143,9 @@ endif
 	ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.19
 	ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.20
 
+	# Install libmariadbclient.a compatibility link
+	ln -s libmariadb.a $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.a
+
 override_dh_fixperms:
 	dh_fixperms
 	chmod 04755 debian/mariadb-server-10.5/usr/lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool