diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes
index 694fd6b..dd9d27c 100644
--- a/mariadb-connector-c.changes
+++ b/mariadb-connector-c.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov 19 07:41:13 UTC 2017 - mpluskal@suse.com
+
+- Use more cmake macros
+- Run spec-cleaner
+
 -------------------------------------------------------------------
 Fri Nov 17 14:20:39 UTC 2017 - adam.majer@suse.de
 
diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec
index d0729bf..91e4dad 100644
--- a/mariadb-connector-c.spec
+++ b/mariadb-connector-c.spec
@@ -16,7 +16,6 @@
 #
 
 
-%bcond_with sqlite3
 %define sover 3
 %define libname libmariadb
 # equivalent mariadb version
@@ -24,7 +23,7 @@
 %if ! %{defined _rundir}
 %define _rundir %{_localstatedir}/run
 %endif
-
+%bcond_with sqlite3
 Name:           mariadb-connector-c
 Version:        3.0.2
 Release:        0
@@ -41,15 +40,14 @@ Patch1:         mariadb-connector-c-2.3.1_unresolved_symbols.patch
 Patch3:         absolute_path_fix.patch
 Patch4:         private_library.patch
 Patch5:         0334aa48.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
 BuildRequires:  curl-devel
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(krb5)
-BuildRequires:  pkgconfig(krb5-gssapi)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(zlib)
 %if %{with sqlite3}
-BuildRequires:  sqlite3-devel
+BuildRequires:  pkgconfig(sqlite3)
 %endif
 
 %description
@@ -72,8 +70,8 @@ Summary:        Plugins for the MariaDB C Connector
 # dialog.so was in mariadb-client package
 # mysql_clear_password.so was in mariadb package
 Group:          System/Libraries
-Conflicts:      mariadb-client <= 10.1.25
 Conflicts:      mariadb <= 10.1.25
+Conflicts:      mariadb-client <= 10.1.25
 
 %description -n %{libname}_plugins
 MariaDB Connector is used to connect applications developed in
@@ -92,6 +90,8 @@ C or C++ to MariaDB and MySQL databases.
 This package holds the runtime components with private API.
 
 %package -n %{libname}-devel
+Summary:        Development files for the MariaDB Connector C API
+Group:          Development/Libraries/C and C++
 Requires:       %{libname}%{sover} = %{version}
 Requires:       pkgconfig(openssl)
 # mysql-devel needs to be provided as some pkgs still depend on it
@@ -102,8 +102,6 @@ Obsoletes:      libmysqlclient-devel < %{mariadb_version}
 # libmysqlclient_r.so was in libmysqlclient_r18 subpackage, now it's here
 Provides:       libmysqlclient_r18 = %{mariadb_version}
 Obsoletes:      libmysqlclient_r18 < %{mariadb_version}
-Summary:        Development files for the MariaDB Connector C API
-Group:          Development/Libraries/C and C++
 
 %description -n %{libname}-devel
 MariaDB Connector is used to connect applications developed in
@@ -129,8 +127,8 @@ This package holds the development files.
   -DINSTALL_INCLUDEDIR:STRING=%{_includedir}/mysql \
   -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mysql/plugin/ \
   -DWITH_MYSQLCOMPAT=ON \
-  -DWITH_SSL=OPENSSL 
-make %{?_smp_mflags}
+  -DWITH_SSL=OPENSSL
+%make_jobs
 
 %install
 %cmake_install
@@ -148,8 +146,12 @@ ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql/mysql_version.h
 install -Dpm 0644 build/include/ma_config.h \
   %{buildroot}%{_includedir}/mysql/my_config.h
 
+%post   -n %{libname}%{sover} -p /sbin/ldconfig
+%post   -n %{libname}private -p /sbin/ldconfig
+%postun -n %{libname}%{sover} -p /sbin/ldconfig
+%postun -n %{libname}private -p /sbin/ldconfig
+
 %files -n %{libname}%{sover}
-%defattr(-,root,root)
 %doc README COPYING.LIB
 %{_libdir}/libmariadb.so.%{sover}
 
@@ -166,7 +168,6 @@ install -Dpm 0644 build/include/ma_config.h \
 %{_libdir}/libmariadbprivate.so
 
 %files -n %{libname}-devel
-%defattr(-,root,root)
 %{_bindir}/mariadb_config
 %{_bindir}/mysql_config
 %dir %{_includedir}/mysql
@@ -175,9 +176,4 @@ install -Dpm 0644 build/include/ma_config.h \
 %{_libdir}/libmysqlclient.so
 %{_libdir}/libmysqlclient_r.so
 
-%post   -n %{libname}%{sover} -p /sbin/ldconfig
-%post   -n %{libname}private -p /sbin/ldconfig
-%postun -n %{libname}%{sover} -p /sbin/ldconfig
-%postun -n %{libname}private -p /sbin/ldconfig
-
 %changelog