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 36be3cc..9a80e4c 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:724214b830efcfb4bb1226483d087ddc4bfffedd78086a09f98c065487e49754
-size 217
+oid sha256:f381090447bd538860087dad8be357b2da9e9ee82a11f1ea6037d68b8c759028
+size 214
diff --git a/mariadb-5.3.5-ga.tar.bz2 b/mariadb-5.3.5-ga.tar.bz2
deleted file mode 100644
index a27d5c1..0000000
--- a/mariadb-5.3.5-ga.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bd82bf9bd5d2f52305293c57e0f610b57c522517cff0075a2d81cca929808c09
-size 20123831
diff --git a/mariadb-5.3.6.tar.bz2 b/mariadb-5.3.6.tar.bz2
new file mode 100644
index 0000000..bd74837
--- /dev/null
+++ b/mariadb-5.3.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad53295814e1b1077e140d0c6d921788e969677757c54be5fb7c4a1a406944c8
+size 20352462
diff --git a/mariadb.changes b/mariadb.changes
index 859b49e..ae06373 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Apr 10 11:42:16 CEST 2012 - mhrusecky@suse.cz
+
+- updated to MariaDB 5.3.6
+  * Release notes:
+    http://kb.askmonty.org/v/mariadb-536-release-notes
+  * Changelog:
+    http://kb.askmonty.org/v/mariadb-536-changelog
+
 -------------------------------------------------------------------
 Mon Mar 12 16:03:38 UTC 2012 - mhrusecky@suse.cz
 
diff --git a/mariadb.spec b/mariadb.spec
index 958f8cd..952f45a 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -34,13 +34,13 @@
 
 Name:           mariadb
 Summary:        Server part of MariaDB
-Version:        5.3.5
+Version:        5.3.6
 Release:        1
-%define srv_vers 5.1.60
+%define srv_vers 5.1.62
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Productivity/Databases/Servers
 Url:            http://www.mariab.org
-Source:         mariadb-%{version}-ga.tar.bz2
+Source:         mariadb-%{version}.tar.bz2
 Source2:        baselibs.conf
 Source3:        README.debug
 Source4:        suse-test-run
@@ -330,7 +330,7 @@ advanced user.  They should be used with caution.
 %endif
 
 %prep
-%setup -q -n mariadb-%{version}-ga -D -a 9
+%setup -q -n mariadb-%{version} -D -a 9
 cp %_sourcedir/README.SuSE .
 cp %_sourcedir/suse-test-run .
 # apply patches from series