diff --git a/build.inc b/build.inc
index e9438c0..c2d5283 100644
--- a/build.inc
+++ b/build.inc
@@ -6,7 +6,7 @@
 %if 0%{?suse_version} > 1140
 export WARN_DIS="$WARN_DIS -Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter "
 %endif
-export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DFORCE_INIT_OF_VARS $WARN_DIS "
+export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS $WARN_DIS "
 export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti"
 
 %if 0%{use_cmake} < 1
diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index 2a1d9b6..4f9b9fb 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:4874cb4a3c8a9f81cdc49aaf91de9e03bf36e46721a86355cf5fbe07cd7d7613
+oid sha256:aaf66464e7ac6efc42954db0f482d5a9ae03cc06f0564eb55a3fb5221925c0b1
 size 217
diff --git a/mariadb-5.5.23.tar.bz2 b/mariadb-5.5.23.tar.bz2
deleted file mode 100644
index 84c9760..0000000
--- a/mariadb-5.5.23.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a1ac784a9e69a35a901b057c64d03d118aa58a4b41e3eed948638e3651f5b74
-size 20969691
diff --git a/mariadb-5.5.24.tar.bz2 b/mariadb-5.5.24.tar.bz2
new file mode 100644
index 0000000..af76b97
--- /dev/null
+++ b/mariadb-5.5.24.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4223517a8c3fd3edd496268c3831798421fafb85d49b7f99e973f0158ae18fd3
+size 20943519
diff --git a/mariadb.changes b/mariadb.changes
index ce9d38f..47ce261 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jun 19 10:52:13 CEST 2012 - mhrusecky@suse.cz
+
+- updated to MariaDB 5.3.6
+  * Release notes:
+    http://kb.askmonty.org/v/mariadb-5524-release-notes
+  * Changelog:
+    http://kb.askmonty.org/v/mariadb-5524-changelog
+
 -------------------------------------------------------------------
 Sat Jun  9 18:30:56 UTC 2012 - xgpub@tellas.gr
 
diff --git a/mariadb.spec b/mariadb.spec
index ddaab2c..565b472 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -34,9 +34,9 @@
 
 Name:           mariadb
 Summary:        Server part of MariaDB
-Version:        5.5.23
+Version:        5.5.24
 Release:        1
-%define srv_vers 5.5.23
+%define srv_vers 5.5.24
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Productivity/Databases/Servers
 Url:            http://www.mariab.org
@@ -489,7 +489,7 @@ fi
 %{_libdir}/libmariadbclient.so.*
 %dir %_libdir/mysql
 %dir %_libdir/mysql/plugin
-%_libdir/mysql/plugin/dialog*.so
+%_libdir/mysql/plugin/dialog.so
 
 %if 0%{cluster} > 1
 
diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2
index 4528ea1..a3d1249 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:5f165e6ee07af134e003c46eb59ac2fd2d2085108254c3ecb863b5eb16cd6c84
-size 11075
+oid sha256:d3f21fef0e7380382d842ecf0d583de275e4ceb66730c548605062f50ad4128e
+size 11024