diff --git a/baselibs.conf b/baselibs.conf
index 40088d1..6278f3f 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,2 +1,2 @@
-libmariadbclient18
-libmariadbclient_r18
+libmysqlclient18
+libmysqlclient_r18
diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index 7c0b097..2377671 100644
--- a/configuration-tweaks.tar.bz2
+++ b/configuration-tweaks.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37d24159308408f3a3ae535018a312eff596a1bbf5f4a0037ce68361b11a115e
+oid sha256:95594a9155132c002b87a956939cb5a37a93422d393729c9cf40fdeaf4361c15
 size 220
diff --git a/mariadb.changes b/mariadb.changes
index 3319ecc..96438de 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 17 09:14:41 CET 2013 - mhrusecky@suse.cz
+
+- making MariaDB default
+
 -------------------------------------------------------------------
 Fri Jan  4 12:52:20 CET 2013 - mhrusecky@suse.cz
 
diff --git a/mariadb.spec b/mariadb.spec
index 4dafe08..f894cce 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -17,7 +17,7 @@
 
 
 # Few definitions which will alter build
-%define prefered   0
+%define prefered   1
 %define use_cmake  1
 %define cluster    0
 %define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb
@@ -146,21 +146,21 @@ This package contains the development header files and libraries
 for developing applications that embed the MariaDB.
 %endif
 
-%package -n libmariadbclient18
+%package -n libmysqlclient18
 Summary:        Shared Libraries for MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Development/Libraries/Other
 
-%description -n libmariadbclient18
+%description -n libmysqlclient18
 This package contains the shared libraries (.so) which certain
 languages and applications need to dynamically load and use MariaDB.
 
-%package -n libmariadbclient_r18
+%package -n libmysqlclient_r18
 Summary:        Shared Libraries for MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Development/Libraries/Other
 
-%description -n libmariadbclient_r18
+%description -n libmysqlclient_r18
 This package contains the shared libraries (.so) which certain
 languages and applications need to dynamically load and use MariaDB.
 
@@ -360,9 +360,11 @@ rm -f sql/sql_builtin.cc
 sed -i 's|@localstatedir@|/var/log|' support-files/mysql-log-rotate.sh
 %if 0%{prefered} < 1
 for i in `grep -Rl mysqlclient .`; do
-	sed -i 's|mysqlclient|mariadbclient|g' $i
+	sed -i 's|mysqlclient|mysqlclient|g' $i
 done
 %endif
+# Broken test that needs sources
+rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result
 
 %build
 %{expand:%(cat %_sourcedir/build.inc)}
@@ -421,13 +423,13 @@ fi
 # Various ldconfig post scripts                                       #
 #######################################################################
 
-%post -n libmariadbclient18 -p /sbin/ldconfig
+%post -n libmysqlclient18 -p /sbin/ldconfig
 
-%postun -n libmariadbclient18 -p /sbin/ldconfig
+%postun -n libmysqlclient18 -p /sbin/ldconfig
 
-%post -n libmariadbclient_r18 -p /sbin/ldconfig
+%post -n libmysqlclient_r18 -p /sbin/ldconfig
 
-%postun -n libmariadbclient_r18 -p /sbin/ldconfig
+%postun -n libmysqlclient_r18 -p /sbin/ldconfig
 
 %if 0%{cluster} > 1
 
@@ -504,9 +506,9 @@ fi
 %_libdir/libmysqld.so.*
 %endif
 
-%files -n libmariadbclient18
+%files -n libmysqlclient18
 %defattr(-, root, root)
-%{_libdir}/libmariadbclient.so.*
+%{_libdir}/libmysqlclient.so.*
 
 %if 0%{cluster} > 1
 
@@ -515,9 +517,9 @@ fi
 %{_libdir}/libndbclient.so.*
 %endif
 
-%files -n libmariadbclient_r18
+%files -n libmysqlclient_r18
 %defattr(-, root, root)
-%{_libdir}/libmariadbclient_r.so.*
+%{_libdir}/libmysqlclient_r.so.*
 
 %files bench -f mysql-bench.files
 %defattr(-, root, root)