diff --git a/baselibs.conf b/baselibs.conf
index ad6c1ab..40088d1 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,2 +1,2 @@
-libmariadbclient16
-libmariadbclient_r16
+libmariadbclient18
+libmariadbclient_r18
diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index 9a80e4c..c4896ea 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:f381090447bd538860087dad8be357b2da9e9ee82a11f1ea6037d68b8c759028
-size 214
+oid sha256:e53bcb6172cccecbc918b4126248b98bb23db16c5b87cc17c5ab3bc08d7ce05e
+size 219
diff --git a/mariadb-5.3.6.tar.bz2 b/mariadb-5.3.6.tar.bz2
deleted file mode 100644
index bd74837..0000000
--- a/mariadb-5.3.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad53295814e1b1077e140d0c6d921788e969677757c54be5fb7c4a1a406944c8
-size 20352462
diff --git a/mariadb-5.5.23.tar.bz2 b/mariadb-5.5.23.tar.bz2
new file mode 100644
index 0000000..84c9760
--- /dev/null
+++ b/mariadb-5.5.23.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a1ac784a9e69a35a901b057c64d03d118aa58a4b41e3eed948638e3651f5b74
+size 20969691
diff --git a/mariadb.changes b/mariadb.changes
index ae06373..0b9a932 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Apr 15 09:51:54 CEST 2012 - mhrusecky@suse.cz
+
+- migrated to MariaDB 5.5.23, see:
+  http://kb.askmonty.org/en/what-is-mariadb-55
+  http://kb.askmonty.org/en/release-notes-mariadb-55-series
+  http://kb.askmonty.org/en/changelogs-mariadb-55-series
+
 -------------------------------------------------------------------
 Tue Apr 10 11:42:16 CEST 2012 - mhrusecky@suse.cz
 
diff --git a/mariadb.spec b/mariadb.spec
index 952f45a..71ca500 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -18,12 +18,12 @@
 # norootforbuild
 
 # Few definitions which will alter build
-%define prefered   0
-%define use_cmake  0
+%define prefered   1
+%define use_cmake  1
 %define cluster    0
 %define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb
 %define use_extra_provides 1
-%define extra_provides mariadb_53
+%define extra_provides mariadb_55
 
 %if %{?rel:0}%{!?rel:1}
 %define rel 1
@@ -34,9 +34,9 @@
 
 Name:           mariadb
 Summary:        Server part of MariaDB
-Version:        5.3.6
+Version:        5.5.23
 Release:        1
-%define srv_vers 5.1.62
+%define srv_vers 5.5.23
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Productivity/Databases/Servers
 Url:            http://www.mariab.org
@@ -101,8 +101,8 @@ This package only contains the server-side programs.
 # mysql-devel was last used in openSUSE 10.2
 Provides:       mysql-devel = %srv_vers-%release
 Obsoletes:      mysql-devel < %srv_vers
-Requires:       libmysqlclient16 = %version
-Requires:       libmysqlclient_r16 = %version
+Requires:       libmysqlclient18 = %version
+Requires:       libmysqlclient_r18 = %version
 Requires:       glibc-devel
 Requires:       openssl-devel
 Requires:       zlib-devel
@@ -114,12 +114,12 @@ Group:          Development/Libraries/C and C++
 This package contains the development header files and libraries
 necessary to develop client applications for MariaDB.
 
-%package -n libmysqld16
+%package -n libmysqld18
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Summary:        MariaDB embedded server development files
 Group:          Development/Libraries/C and C++
 
-%description -n libmysqld16
+%description -n libmysqld18
 This package contains the development header files and libraries
 for developing applications that embed the MariaDB.
 
@@ -129,7 +129,7 @@ Summary:        MariaDB embedded server development files
 # the headers files are the shared
 Requires:       libmysqlclient-devel = %version
 Requires:       tcpd-devel
-Requires:       libmysqld16 = %version
+Requires:       libmysqld18 = %version
 Group:          Development/Libraries/C and C++
 
 %description -n libmysqld-devel
@@ -137,21 +137,21 @@ This package contains the development header files and libraries
 for developing applications that embed the MariaDB.
 %endif
 
-%package -n libmariadbclient16
+%package -n libmariadbclient18
 Summary:        Shared Libraries for MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Development/Libraries/Other
 
-%description -n libmariadbclient16
+%description -n libmariadbclient18
 This package contains the shared libraries (.so) which certain
 languages and applications need to dynamically load and use MariaDB.
 
-%package -n libmariadbclient_r16
+%package -n libmariadbclient_r18
 Summary:        Shared Libraries for MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Development/Libraries/Other
 
-%description -n libmariadbclient_r16
+%description -n libmariadbclient_r18
 This package contains the shared libraries (.so) which certain
 languages and applications need to dynamically load and use MariaDB.
 
@@ -410,13 +410,13 @@ fi
 # Various ldconfig post scripts                                       #
 #######################################################################
 
-%post -n libmariadbclient16 -p /sbin/ldconfig
+%post -n libmariadbclient18 -p /sbin/ldconfig
 
-%postun -n libmariadbclient16 -p /sbin/ldconfig
+%postun -n libmariadbclient18 -p /sbin/ldconfig
 
-%post -n libmariadbclient_r16 -p /sbin/ldconfig
+%post -n libmariadbclient_r18 -p /sbin/ldconfig
 
-%postun -n libmariadbclient_r16 -p /sbin/ldconfig
+%postun -n libmariadbclient_r18 -p /sbin/ldconfig
 
 %if 0%{cluster} > 1
 
@@ -484,7 +484,7 @@ fi
 %_libdir/libmysqld.so.*
 %endif
 
-%files -n libmariadbclient16
+%files -n libmariadbclient18
 %defattr(-, root, root)
 %{_libdir}/libmariadbclient.so.*
 
@@ -495,7 +495,7 @@ fi
 %{_libdir}/libndbclient.so.*
 %endif
 
-%files -n libmariadbclient_r16
+%files -n libmariadbclient_r18
 %defattr(-, root, root)
 %{_libdir}/libmariadbclient_r.so.*
 
diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2
index 0796800..26ced5f 100644
--- a/mysql-patches.tar.bz2
+++ b/mysql-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58d09931800018a2ae2376463d0fee5374cbb284dedcd4e81b2931dd42828b28
-size 16629
+oid sha256:cdf9fa30d8988fd0012643ab0a10cfc16512a5c99a70fbb1155bd69b6a849395
+size 10796
diff --git a/series b/series
index c1cc216..58a59e1 100644
--- a/series
+++ b/series
@@ -1,21 +1,11 @@
-mysql-community-server-5.1.31-shebang.patch
-mariadb-5.3.2-scripts-paths.patch
-mysql-community-server-5.1.33-ssl-lib64-macro.patch
-mysql-community-server-5.1.36-bmove512.patch
 mysql-community-server-5.1.36-hotcopy.patch
-mariadb-5.2.6-group.patch
 mysql-community-server-5.1.45-multi-configuration.patch
-mariadb-5.2.6-safe-process-in-bin.patch
 mysql-community-server-5.1.46-logrotate.patch
 mariadb-5.1.50-strncat-overflow.patch
 mariadb-5.2.6-install_db-quiet.patch
-mariadb-5.3.3-myslq-test.patch
 mysql-community-server-5.1.51-mysql_config.patch
 mysql-community-server-5.1.51-mysqld_multi-features.patch
-mariadb-5.3.2-plugins-avoid-version.patch
 mariadb-5.1.50-upgrade-exit-status.patch
 mariadb-5.2.3-cnf.patch
-mariadb-5.2.4-libmysql-no-pkglibdir.patch
-mysql-community-server-5.1.53-ssl-compilation-fix.patch
-mariadb-5.3.3-compilation-fix.patch
-mariadb-5.3.3-readline-includes.patch
+mysql-community-server-5.5.6-safe-process-in-bin.patch
+mariadb-5.5.20-group.patch