diff --git a/component/groonga/buildout.cfg b/component/groonga/buildout.cfg
index b5394501d32d1af5873c3da9ba3e79c9ba5b895c..3044d5e81b0caa55b711320e27329366919a27f2 100644
--- a/component/groonga/buildout.cfg
+++ b/component/groonga/buildout.cfg
@@ -7,8 +7,8 @@ parts =
 
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-2.0.0.tar.gz
-md5sum = 09e6a34db15cf42b6a3aff07e0f841ff
+url = http://packages.groonga.org/source/groonga/groonga-2.0.1.tar.gz
+md5sum = 806daed3e0e5bb12d591dcf326e4ccd5
 configure-options =
   --disable-static
   --disable-glibtest
diff --git a/component/mariadb/buildout.cfg b/component/mariadb/buildout.cfg
index 3fa8cf611d75b74197191270fefd3dc89ab6e89b..c1b7b8b7cc0aae06d3f65d8f723e51fe1e83d370 100644
--- a/component/mariadb/buildout.cfg
+++ b/component/mariadb/buildout.cfg
@@ -16,66 +16,6 @@ extends =
 parts =
   mariadb
 
-[mariadb-no_test-patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = d65f61829cfbcd5062f49db2b00bd6fe
-filename = mysql_create_system_tables__no_test.patch
-download-only = true
-
-[mariadb]
-recipe = hexagonit.recipe.cmmi
-version = 5.3.5-ga
-url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = 98ce0441b37c8d681855150495fdc03b
-# compile directory is required to build mysql plugins.
-keep-compile-dir = true
-# configure: how to avoid searching for my.cnf?
-#  - like in mysql part in http://svn.zope.org/zodbshootout/trunk/buildout.cfg?view=markup
-# we use embeded yassl instead of openssl to avoid compilation errors on sphinx search engine.
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --disable-static
-  --enable-thread-safe-client
-  --enable-local-infile
-  --enable-assembler
-  --with-pic
-  --with-fast-mutexes
-  --with-charset=utf8
-  --with-extra-charsets=complex
-  --with-collation=utf8_unicode_ci
-  --with-big-tables
-  --without-embedded-server
-  --with-plugins=max-no-ndb
-  --with-aria-tmp-tables
-  --without-plugin-oqgraph
-  --without-readline
-  --with-ssl
-  --with-libevent=${libevent:location}
-  --with-zlib-dir=${zlib:location}
-
-patch-options = -p0
-patches =
-  ${mariadb-no_test-patch:location}/${mariadb-no_test-patch:filename}
-environment =
-  CPPFLAGS=-I${ncurses:location}/include -I${readline5:location}/include
-  LDFLAGS=-Wl,-rpath=${libevent:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline5:location}/lib -Wl,-rpath=${readline5:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-[mroonga-mariadb]
-recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.00.tar.gz
-md5sum = 49dab92863b5c3fa1d49344c73357ca2
-configure-options =
-  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
-  --with-mysql-config=${mariadb:location}/bin/mysql_config
-depends =
-  ${mariadb:version}
-environment =
-  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS=-I${groonga:location}/include/groonga
-  LDFLAGS=-L${groonga:location}/lib
-  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
-
 [mariadb-5.5-no_test-patch]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
@@ -83,11 +23,11 @@ md5sum = 14e6d713c16298a10f40d29f2b799aca
 filename = mariadb_5.5_create_system_tables__no_test.patch
 download-only = true
 
-[mariadb-5.5]
+[mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.5.20
+version = 5.5.22
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = e618343b5039fa468c0e1e6098785e3c
+md5sum = d7d3bedd56cede5a045cb3fadf6b344e
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -116,15 +56,15 @@ environment =
   CMAKE_LIBRARY_PATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
   LDFLAGS=-L${libaio:location}/lib
 
-[mroonga-mariadb-5.5]
+[mroonga-mariadb]
 recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.00.tar.gz
-md5sum = 49dab92863b5c3fa1d49344c73357ca2
+url = https://github.com/downloads/mroonga/mroonga/mroonga-2.01.tar.gz
+md5sum = e1c4ba8ac50aa3750b9acde147eeec4b
 configure-options =
-  --with-mysql-source=${mariadb-5.5:location}__compile__/mariadb-${mariadb-5.5:version}
-  --with-mysql-config=${mariadb-5.5:location}/bin/mysql_config
+  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
+  --with-mysql-config=${mariadb:location}/bin/mysql_config
 depends =
-  ${mariadb-5.5:version}
+  ${mariadb:version}
 environment =
   PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga
diff --git a/software/MediaWiki/instance.cfg b/software/MediaWiki/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/MediaWiki/instance.cfg
+++ b/software/MediaWiki/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/SilverStripe/instance.cfg b/software/SilverStripe/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/SilverStripe/instance.cfg
+++ b/software/SilverStripe/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/b2evolution/instance.cfg b/software/b2evolution/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/b2evolution/instance.cfg
+++ b/software/b2evolution/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/cmsmadesimple/instance.cfg b/software/cmsmadesimple/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/cmsmadesimple/instance.cfg
+++ b/software/cmsmadesimple/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/coppermine/instance.cfg b/software/coppermine/instance.cfg
index fffebea8fe2c6c76697fe4be87552f265614a35d..5d87da547e15ba339a03f32d8773f3dceeeb1c12 100644
--- a/software/coppermine/instance.cfg
+++ b/software/coppermine/instance.cfg
@@ -14,4 +14,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/dotclear/instance.cfg b/software/dotclear/instance.cfg
index fffebea8fe2c6c76697fe4be87552f265614a35d..5d87da547e15ba339a03f32d8773f3dceeeb1c12 100644
--- a/software/dotclear/instance.cfg
+++ b/software/dotclear/instance.cfg
@@ -14,4 +14,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/dotproject/instance.cfg b/software/dotproject/instance.cfg
index fffebea8fe2c6c76697fe4be87552f265614a35d..5d87da547e15ba339a03f32d8773f3dceeeb1c12 100644
--- a/software/dotproject/instance.cfg
+++ b/software/dotproject/instance.cfg
@@ -14,4 +14,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/drupal/instance.cfg b/software/drupal/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/drupal/instance.cfg
+++ b/software/drupal/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/eSKUeL/instance.cfg b/software/eSKUeL/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/eSKUeL/instance.cfg
+++ b/software/eSKUeL/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/erp5/instance-mariadb.cfg.in b/software/erp5/instance-mariadb.cfg.in
index 56811bf778fa24dafed6f306954cc3b8ec8bcbbf..7a6ebae78d65d459c16957cb9bad63e7257d6fc7 100644
--- a/software/erp5/instance-mariadb.cfg.in
+++ b/software/erp5/instance-mariadb.cfg.in
@@ -59,7 +59,7 @@ innobackupex-binary = {{ xtrabackup_location }}/bin/innobackupex
 mysql-binary = {{ mariadb_location }}/bin/mysql
 mysql-install-binary = {{ mariadb_location }}/bin/mysql_install_db
 mysql-upgrade-binary = {{ mariadb_location }}/bin/mysql_upgrade
-mysqld-binary = {{ mariadb_location }}/libexec/mysqld
+mysqld-binary = {{ mariadb_location }}/bin/mysqld
 pt-archiver-binary = {{ perl_siteprefix }}/bin/pt-archiver
 pt-config-diff-binary = {{ perl_siteprefix }}/bin/pt-config-diff
 pt-deadlock-logger-binary = {{ perl_siteprefix }}/bin/pt-deadlock-logger
diff --git a/software/ezpublish/instance.cfg b/software/ezpublish/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/ezpublish/instance.cfg
+++ b/software/ezpublish/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/joomla/instance.cfg b/software/joomla/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/joomla/instance.cfg
+++ b/software/joomla/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/lamp-template/instance.cfg b/software/lamp-template/instance.cfg
index fffebea8fe2c6c76697fe4be87552f265614a35d..5d87da547e15ba339a03f32d8773f3dceeeb1c12 100644
--- a/software/lamp-template/instance.cfg
+++ b/software/lamp-template/instance.cfg
@@ -14,4 +14,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/magento/instance.cfg b/software/magento/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/magento/instance.cfg
+++ b/software/magento/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/mariadb/instance-mariadb.cfg b/software/mariadb/instance-mariadb.cfg
index 2685dffebb6bd81f1087c644d4eafb7174a33599..fc6dcb8661a73c0aef44975280f764b2d0fefe72 100644
--- a/software/mariadb/instance-mariadb.cfg
+++ b/software/mariadb/instance-mariadb.cfg
@@ -48,7 +48,7 @@ backup-pending-directory = $${directory:mariadb-backup-pending}
 mysql-binary = ${mariadb:location}/bin/mysql
 mysql-install-binary = ${mariadb:location}/bin/mysql_install_db
 mysql-upgrade-binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld-binary = ${mariadb:location}/libexec/mysqld
+mysqld-binary = ${mariadb:location}/bin/mysqld
 mysqldump-binary = ${mariadb:location}/bin/mysqldump
 gzip-binary = $${buildout:gzip-binary}
 zcat-binary = ${gzip:location}/bin/zcat
diff --git a/software/net2ftp/instance.cfg b/software/net2ftp/instance.cfg
index 6939e38b9f9827fc20c253da9e6ea4237f9eb39b..937ad4663fd2702e18e7ab970040849c9416308d 100644
--- a/software/net2ftp/instance.cfg
+++ b/software/net2ftp/instance.cfg
@@ -15,7 +15,7 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
 
 #delete = 
 #rename = 
diff --git a/software/openX/instance.cfg b/software/openX/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/openX/instance.cfg
+++ b/software/openX/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/os-commerce/instance.cfg b/software/os-commerce/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/os-commerce/instance.cfg
+++ b/software/os-commerce/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/phpbb/instance.cfg b/software/phpbb/instance.cfg
index a099e8a108a173ef184c8988c5440f079445c326..45ea1e7bed2a4938aa453a0e79e6dd8ed6fb7ce4 100644
--- a/software/phpbb/instance.cfg
+++ b/software/phpbb/instance.cfg
@@ -13,7 +13,7 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
 
 delete = install
 #rename = 
diff --git a/software/phpmyadmin/instance.cfg b/software/phpmyadmin/instance.cfg
index fffebea8fe2c6c76697fe4be87552f265614a35d..5d87da547e15ba339a03f32d8773f3dceeeb1c12 100644
--- a/software/phpmyadmin/instance.cfg
+++ b/software/phpmyadmin/instance.cfg
@@ -14,4 +14,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/phpnuke/instance.cfg b/software/phpnuke/instance.cfg
index fffebea8fe2c6c76697fe4be87552f265614a35d..5d87da547e15ba339a03f32d8773f3dceeeb1c12 100644
--- a/software/phpnuke/instance.cfg
+++ b/software/phpnuke/instance.cfg
@@ -14,4 +14,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/pimcore/instance.cfg b/software/pimcore/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/pimcore/instance.cfg
+++ b/software/pimcore/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/piwigo/instance.cfg b/software/piwigo/instance.cfg
index fffebea8fe2c6c76697fe4be87552f265614a35d..5d87da547e15ba339a03f32d8773f3dceeeb1c12 100644
--- a/software/piwigo/instance.cfg
+++ b/software/piwigo/instance.cfg
@@ -14,4 +14,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/piwik/instance.cfg b/software/piwik/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/piwik/instance.cfg
+++ b/software/piwik/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/prestashop/instance.cfg b/software/prestashop/instance.cfg
index 6f59ff8879a332b7c863ebb10ebc73f6a06b5235..677614239de74430ad71b4f0187122928a80fb51 100644
--- a/software/prestashop/instance.cfg
+++ b/software/prestashop/instance.cfg
@@ -13,7 +13,7 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
 
 delete = install
 rename = admin
diff --git a/software/punbb/instance.cfg b/software/punbb/instance.cfg
index fffebea8fe2c6c76697fe4be87552f265614a35d..5d87da547e15ba339a03f32d8773f3dceeeb1c12 100644
--- a/software/punbb/instance.cfg
+++ b/software/punbb/instance.cfg
@@ -14,4 +14,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/simpleMachineForum/instance.cfg b/software/simpleMachineForum/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/simpleMachineForum/instance.cfg
+++ b/software/simpleMachineForum/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/spip/instance.cfg b/software/spip/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/spip/instance.cfg
+++ b/software/spip/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/statusnet/instance.cfg b/software/statusnet/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/statusnet/instance.cfg
+++ b/software/statusnet/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/sugar-crm/instance.cfg b/software/sugar-crm/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/sugar-crm/instance.cfg
+++ b/software/sugar-crm/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/tiki/instance.cfg b/software/tiki/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/tiki/instance.cfg
+++ b/software/tiki/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/xoops/instance.cfg b/software/xoops/instance.cfg
index 9495bde7e7cadfe7dcb518156bf58a4f6a9c2a1c..d9714339867c859cbf336bbef1bb8c0db15c9e4b 100644
--- a/software/xoops/instance.cfg
+++ b/software/xoops/instance.cfg
@@ -12,4 +12,4 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
diff --git a/software/zencart/instance.cfg b/software/zencart/instance.cfg
index a29b488b11f44d12325efd8df7183ca1fa358a0e..f13a771f605198877909378a42427ab9506b9872 100644
--- a/software/zencart/instance.cfg
+++ b/software/zencart/instance.cfg
@@ -13,7 +13,7 @@ httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
 
 delete = zc_install
 rename = admin
diff --git a/stack/lamp/instance-mariadb.cfg b/stack/lamp/instance-mariadb.cfg
index 6c4a8f0fb213d559fac6bddc95f644b37f4fd1ed..8b37ab190b930a2ce4e9843de0be1108700fbbac 100644
--- a/stack/lamp/instance-mariadb.cfg
+++ b/stack/lamp/instance-mariadb.cfg
@@ -47,7 +47,7 @@ promise = $${basedirectory:promises}/mysql
 mysql-binary = ${mariadb:location}/bin/mysql
 mysql-install-binary = ${mariadb:location}/bin/mysql_install_db
 mysql-upgrade-binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld-binary = ${mariadb:location}/libexec/mysqld
+mysqld-binary = ${mariadb:location}/bin/mysqld
 
 
 [certificate-authority]