diff --git a/Makefile b/Makefile
index 1c3f26b..9ccc974 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,29 @@ CC := gcc
 CPPFLAGS := -DMEDIATOR_VERSION="\"$(VERSION)\""
 
 GLIB_CFLAGS := $(shell pkg-config glib-2.0 --cflags)
-CFLAGS := -I/usr/include/mysql $(GLIB_CFLAGS) -g -Wall -Wextra -O2 -D_GNU_SOURCE
+
+# mariadb/mysql support
+ifneq ($(shell which mariadb_config),)
+MYSQL_CFLAGS := $(shell mariadb_config --cflags)
+MYSQL_LDFLAGS := $(shell mariadb_config --libs)
+else ifneq ($(shell which mysql_config),)
+MYSQL_CFLAGS := $(shell mysql_config --cflags)
+MYSQL_LDFLAGS := $(shell mysql_config --libs)
+else
+MYSQL_CFLAGS := -I/usr/include/mysql
+MYSQL_LDFLAGS := -lmysqlclient
+endif
+
+CFLAGS := $(GLIB_CFLAGS) -g -Wall -Wextra -O2 -D_GNU_SOURCE
+CFLAGS += $(MYSQL_CFLAGS)
 #CFLAGS += -DWITH_TIME_CALC
 CFLAGS += $(shell pkg-config json-c --cflags)
 CFLAGS += $(shell pkg-config hiredis --cflags)
 CFLAGS += $(shell pkg-config libsystemd --cflags)
 
 GLIB_LDFLAGS := $(shell pkg-config glib-2.0 --libs)
-LDFLAGS := $(GLIB_LDFLAGS) -lmysqlclient
+LDFLAGS := $(GLIB_LDFLAGS)
+LDFLAGS += $(MYSQL_LDFLAGS)
 LDFLAGS += $(shell pkg-config json-c --libs)
 LDFLAGS += $(shell pkg-config hiredis --libs)
 LDFLAGS += $(shell pkg-config libsystemd --libs)
diff --git a/debian/control b/debian/control
index dc3ceb7..9ab5d9f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Sipwise Development Team <support@sipwise.com>
 Build-Depends:
  debhelper (>= 10),
- default-libmysqlclient-dev | libmysqlclient15-dev,
+ default-libmysqlclient-dev,
  libglib2.0-dev,
  libhiredis-dev,
  libjson-c-dev,
diff --git a/medmysql.c b/medmysql.c
index c90d943..4cf5385 100644
--- a/medmysql.c
+++ b/medmysql.c
@@ -1,5 +1,3 @@
-#include <my_global.h>
-#include <m_string.h>
 #include <mysql.h>
 #include <mysql/errmsg.h>
 #include <mysql/mysqld_error.h>