diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install
index 48120822f81..6826316d188 100644
--- a/debian/libmariadb-dev.install
+++ b/debian/libmariadb-dev.install
@@ -29,6 +29,7 @@ usr/lib/*/libmariadbclient.a
 usr/lib/*/libmariadbclient.so
 usr/lib/*/libmysqlservices.a
 usr/lib/*/pkgconfig/libmariadb.pc
+usr/lib/*/pkgconfig/mariadb.pc
 usr/share/aclocal/mysql.m4
 usr/share/man/man1/mariadb_config.1
 usr/share/man/man1/mysql_config.1
diff --git a/debian/libmariadbd-dev.install b/debian/libmariadbd-dev.install
index 3eebe631b9e..7e499776d73 100644
--- a/debian/libmariadbd-dev.install
+++ b/debian/libmariadbd-dev.install
@@ -3,3 +3,5 @@ usr/lib/*/libmariadbd.a
 usr/lib/*/libmariadbd.so
 usr/lib/*/libmysqld.a
 usr/lib/*/libmysqld.so
+usr/lib/*/pkgconfig/libmariadbd.pc
+usr/lib/*/pkgconfig/mariadb-embedded-server.pc
diff --git a/debian/rules b/debian/rules
index ac33739e752..602a39e3dcf 100644
--- a/debian/rules
+++ b/debian/rules
@@ -161,6 +161,17 @@ override_dh_auto_install:
 	# Rename and install AppArmor profile
 	install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mariadbd
 
+	# Rename mariadb.pc as mariadb-embedded-server.pc as to be more descriptive
+	mv -v $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/mariadb.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/mariadb-embedded-server.pc
+	# Keep libmariadbd.pc around for backwards compatibility as all Debian users
+	# have had it for embedded server since April 2021
+	ln -sf mariadb-embedded-server.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libmariadbd.pc
+
+	# Rename libmariadb.pc as mariadb.pc as it better fits the client library,
+	# and keep old libmariadb.pc as symlink for backwards compatibility
+	mv -v $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libmariadb.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/mariadb.pc
+	ln -sf mariadb.pc $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libmariadb.pc
+
 	# Install libmariadbclient18 compatibility links
 	ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so
 	ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so.18