diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 31fad6d08..2a13a5971 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 license=('GPL')
 url="https://www.mysql.com/products/community/"
@@ -74,6 +74,8 @@ build() {
 package_libmysqlclient(){
   pkgdesc="MySQL client libraries"
   depends=('openssl')
+  conflicts=('libmariadbclient')
+  provides=("libmariadbclient=$pkgver")
   
   cd build
   for dir in include libmysql libmysqld libservices; do
@@ -91,6 +93,8 @@ package_libmysqlclient(){
 package_mysql-clients(){
   pkgdesc="MySQL client tools"
   depends=('libmysqlclient')
+  conflicts=('mariadb-clients')
+  provides=("mariadb-clients=$pkgver")
   
   cd build
   make -C client DESTDIR="${pkgdir}" install
@@ -110,6 +114,8 @@ package_mysql(){
   backup=('etc/mysql/my.cnf')
   install=mysql.install
   depends=('mysql-clients' 'systemd-tools')
+  conflicts=('mariadb')
+  provides=("mariadb=$pkgver")
   options=('emptydirs')
 
   cd build