diff --git a/debian/mariadb-server.postinst b/debian/mariadb-server.postinst
index ea8de619b5d74..3ebfe174253e2 100644
--- a/debian/mariadb-server.postinst
+++ b/debian/mariadb-server.postinst
@@ -242,6 +242,23 @@ EOF
chown 0:0 $dc
chmod 0600 $dc
+ feedback_cnf=$mariadb_cfgdir/mariadb.conf.d/feedback.cnf
+ if [ ! -f $feedback_cnf ]; then
+ if db_input high mariadb-server/feedback_optin; then
+ db_go || true
+ fi
+ db_get mariadb-server/feedback_optin
+ {
+ echo "# THIS IS A GENERATED FILE. ALL CHANGES TO IT MIGHT BE LOST.";
+ echo "[server]";
+ if [ "$RET" = true ]; then
+ echo "feedback=ON";
+ else
+ echo "feedback=OFF";
+ fi
+ } >> $feedback_cnf
+ fi
+
# If there is a real AppArmor profile, we reload it.
# If the default empty profile is installed, then we remove any old
# profile that may be loaded.
diff --git a/debian/mariadb-server.templates b/debian/mariadb-server.templates
index 3f790bcd25070..601e9099dff8c 100644
--- a/debian/mariadb-server.templates
+++ b/debian/mariadb-server.templates
@@ -43,3 +43,12 @@ _Description: Remove all MariaDB databases?
If you're removing the MariaDB package in order to later install a more
recent version or if a different mariadb-server package is already
using it, the data should be kept.
+
+Template: mariadb-server/feedback_optin
+Type: boolean
+Default: false
+_Description: Enable the Feedback plugin and submit anonymous usage information?
+ Feedback plugin collects basic anonymous statistical information that can be
+ used by the developers to improve MariaDB. This is an easy way to help with
+ MariaDB development. Collected statistics can be viewed at
+ http://mariadb.org/feedback-plugin
diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf
index 98190e14769da..9f4f7e840c925 100644
--- a/support-files/rpm/server.cnf
+++ b/support-files/rpm/server.cnf
@@ -11,6 +11,15 @@
# you can put MariaDB-only options here
[mariadb]
+#
+# * Enable the Feedback plugin and submit anonymous usage information
+#
+# Feedback plugin collects basic anonymous statistical information that can be
+# used by the developers to improve MariaDB. This is an easy way to help with
+# MariaDB development. Collected statistics can be viewed at
+# http://mariadb.org/feedback-plugin
+#feedback=ON
+
# This group is read by both MariaDB and MySQL servers
[mysqld]
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in
index 056a7ec43abdb..07cf6e2eb248a 100644
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
@@ -43,8 +43,6 @@
-
-
@@ -52,6 +50,9 @@
+
+
+
@@ -167,7 +168,7 @@
-
+