diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index 8548ca2..da62ce3 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:55f9dc7300fa294189c5e74d950bdbcefd48bdc916a8f4521a86d1e284fc451b
-size 221
+oid sha256:1e611d2b15a920649b4c891efdb5e5c3f52ae4c8a6f0d32f7d065aab560e6a1a
+size 217
diff --git a/mariadb.changes b/mariadb.changes
index d1f5fbc..dfcf268 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 14 08:20:47 UTC 2015 - michal.hrusecky@opensuse.org
+
+- disable optional features for mariadb
+  * still possible to use them from mariadb_100 package
+
 -------------------------------------------------------------------
 Mon Mar 23 23:24:11 UTC 2015 - dvaleev@suse.com
 
diff --git a/mariadb.spec b/mariadb.spec
index 7f74f82..20ea163 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -26,9 +26,11 @@
 %define _rundir %{_localstatedir}/run
 %endif
 
+%if "%{name}" != "mariadb" && "%{name}" != "mysql"
 %bcond_with     jemalloc
 %bcond_with     oqgraph
 %bcond_with     cassandra
+%endif
 
 Name:           mariadb
 Version:        10.0.17