diff --git a/debian/additions/mariadb.cnf b/debian/additions/mariadb.cnf
index 927e9d1ce88..da21212faef 100644
--- a/debian/additions/mariadb.cnf
+++ b/debian/additions/mariadb.cnf
@@ -15,3 +15,5 @@
 #collation-server      = utf8_general_ci 
 #character_set_server   = utf8 
 #collation_server       = utf8_general_ci 
+# Import all .cnf files from configuration directory
+!includedir /etc/mysql/mariadb.conf.d/
diff --git a/debian/control b/debian/control
index 14374182fe3..d7b24c6ce80 100644
--- a/debian/control
+++ b/debian/control
@@ -318,6 +318,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
            mariadb-server-5.2,
            mariadb-server-5.3,
            mariadb-server-5.5,
+           mariadb-tokudb-engine-10.1,
            mariadb-tokudb-engine-10.0,
            mariadb-tokudb-engine-5.5,
            mysql-server (<< ${source:Version}),
@@ -336,6 +337,7 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
           mariadb-server-5.2,
           mariadb-server-5.3,
           mariadb-server-5.5,
+          mariadb-tokudb-engine-10.1,
           mariadb-tokudb-engine-10.0,
           mariadb-tokudb-engine-5.5,
           mysql-server (<< ${source:Version}),
@@ -462,6 +464,44 @@ Description: OQGraph storage engine for MariaDB
  (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL.
  This package contains the OQGraph plugin for MariaDB.
 
+Package: mariadb-plugin-tokudb
+Architecture: any
+Depends: mariadb-server-10.2|mariadb-galera-server-10.2,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
+Description: TokuDB storage engine for MariaDB
+ The TokuDB storage engine is for use in high-performance and write-intensive
+ environments, offering increased compression and better performance based
+ on fractal indexes.
+ This package contains the TokuDB plugin for MariaDB.
+
+Package: mariadb-plugin-mroonga
+Architecture: any
+Depends: mariadb-server-10.2|mariadb-galera-server-10.2,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
+Description: Mroonga storage engine for MariaDB
+ Mroonga (formerly named Groonga Storage Engine) is a storage engine that
+ provides fast CJK-ready full text searching using column store.
+ This package contains the Mroonga plugin for MariaDB.
+
+Package: mariadb-plugin-spider
+Architecture: any
+Depends: mariadb-server-10.2|mariadb-galera-server-10.2,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
+Description: Spider storage engine for MariaDB
+ The Spider storage engine with built-in sharding features. It supports
+ partitioning and xa transactions, and allows tables of different MariaDB
+ instances to be handled as if they were on the same insctance. It refers to one
+ possible implementation of ISO/IEC 9075-9:2008 SQL/MED.
+
 Package: mariadb-plugin-gssapi-server
 Section: database
 Architecture: any
diff --git a/debian/mariadb-plugin-connect.install b/debian/mariadb-plugin-connect.install
index 0b042607c36..8a7aee412df 100644
--- a/debian/mariadb-plugin-connect.install
+++ b/debian/mariadb-plugin-connect.install
@@ -1,2 +1,2 @@
-usr/lib/mysql/plugin/ha_connect.so
 etc/mysql/conf.d/connect.cnf
+usr/lib/mysql/plugin/ha_connect.so
diff --git a/debian/mariadb-plugin-mroonga.install b/debian/mariadb-plugin-mroonga.install
new file mode 100644
index 00000000000..c28fde2fd18
--- /dev/null
+++ b/debian/mariadb-plugin-mroonga.install
@@ -0,0 +1,3 @@
+usr/lib/mysql/plugin/ha_mroonga.so
+usr/share/mysql/mroonga/install.sql
+usr/share/mysql/mroonga/uninstall.sql
diff --git a/debian/mariadb-plugin-mroonga.postinst b/debian/mariadb-plugin-mroonga.postinst
new file mode 100644
index 00000000000..70b8929250f
--- /dev/null
+++ b/debian/mariadb-plugin-mroonga.postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# Install Mroonga
+# No user or password parameter is required with new MariaDB that
+# has unix socket authentication support by default.
+mysql < /usr/share/mysql/mroonga/install.sql || true
+# Always exit with success instead of leaving dpkg in a broken state
+
+
+#DEBHELPER#
diff --git a/debian/mariadb-plugin-mroonga.prerm b/debian/mariadb-plugin-mroonga.prerm
new file mode 100644
index 00000000000..3f1a1c58e8e
--- /dev/null
+++ b/debian/mariadb-plugin-mroonga.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# Install Mroonga
+# No user or password parameter is required with new MariaDB that
+# has unix socket authentication support by default.
+mysql < /usr/share/mysql/mroonga/uninstall.sql || true
+# Always exit with success instead of leaving dpkg in a broken state
+
+
+#DEBHELPER#
diff --git a/debian/mariadb-plugin-oqgraph.install b/debian/mariadb-plugin-oqgraph.install
index f67b0cd9d13..5e2a892d9e9 100644
--- a/debian/mariadb-plugin-oqgraph.install
+++ b/debian/mariadb-plugin-oqgraph.install
@@ -1 +1,2 @@
+etc/mysql/conf.d/oqgraph.cnf etc/mysql/mariadb.conf.d
 usr/lib/mysql/plugin/ha_oqgraph.so
diff --git a/debian/mariadb-plugin-spider.install b/debian/mariadb-plugin-spider.install
new file mode 100644
index 00000000000..89652fe2f3c
--- /dev/null
+++ b/debian/mariadb-plugin-spider.install
@@ -0,0 +1,2 @@
+usr/lib/mysql/plugin/ha_spider.so
+usr/share/mysql/install_spider.sql
diff --git a/debian/mariadb-plugin-spider.postinst b/debian/mariadb-plugin-spider.postinst
new file mode 100644
index 00000000000..5e43d38226c
--- /dev/null
+++ b/debian/mariadb-plugin-spider.postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# Install Spider
+# No user or password parameter is required with new MariaDB that
+# has unix socket authentication support by default.
+mysql < /usr/share/mysql/install_spider.sql || true
+# Always exit with success instead of leaving dpkg in a broken state
+
+
+#DEBHELPER#
diff --git a/debian/mariadb-plugin-tokudb.install b/debian/mariadb-plugin-tokudb.install
new file mode 100644
index 00000000000..487c9df7120
--- /dev/null
+++ b/debian/mariadb-plugin-tokudb.install
@@ -0,0 +1,4 @@
+etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d
+usr/bin/tokuftdump
+usr/lib/mysql/plugin/ha_tokudb.so
+usr/share/doc/mariadb-server-10.2/README.md usr/share/doc/mariadb-plugin-tokudb/README.md