diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec
index e39d541..e2f1392 100644
--- a/mariadb-connector-c.spec
+++ b/mariadb-connector-c.spec
@@ -1,6 +1,6 @@
 Name:           mariadb-connector-c
 Version:        3.0.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The MariaDB Native Client library (C driver)
 Group:          Applications/Databases
 License:        LGPLv2+
@@ -68,6 +68,12 @@ rm %{buildroot}%{_libdir}/mariadb/libmysqlclient_r.a
 # add a compatibility symlink
 ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config
 
+# move header files to the same location, as they would be in mariadb-server (10.2.8)
+# which means from /usr/include to /usr/include/mysql
+mkdir %{buildroot}%{_includedir}/temporary
+mv %{buildroot}%{_includedir}/{*.h,mysql,mariadb} %{buildroot}%{_includedir}/temporary
+mv %{buildroot}%{_includedir}/temporary %{buildroot}%{_includedir}/mysql
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -101,6 +107,9 @@ ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config
 %license COPYING.LIB
 
 %changelog
+* Wed Sep 13 2017 Michal Schorm <mschorm@redhat.com> - 3.0.2-6
+- move header files to the same location, as they would be in mariadb-server
+
 * Tue Sep 05 2017 Honza Horak <hhorak@redhat.com> - 3.0.2-5
 - Remove a symlink /usr/lib64/mysql that conflicts with mariadb-libs