diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index 9e3549964e1..83cba054be6 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -175,7 +175,7 @@ SET(INSTALL_BINDIR_DEB                  "bin")
 SET(INSTALL_SBINDIR_DEB                 "sbin")
 SET(INSTALL_SCRIPTDIR_DEB               "bin")
 SET(INSTALL_SYSCONFDIR_DEB              "/etc")
-SET(INSTALL_SYSCONF2DIR_DEB             "/etc/mysql/conf.d")
+SET(INSTALL_SYSCONF2DIR_DEB             "/etc/mysql/mariadb.conf.d")
 #
 SET(INSTALL_LIBDIR_DEB                  "lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}")
 SET(INSTALL_PLUGINDIR_DEB               "lib/mysql/plugin")
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 7e9b80991ca..f2cba074397 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -252,7 +252,6 @@ MACRO(MYSQL_ADD_PLUGIN)
             SET(ARG_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.cnf")
             FILE(WRITE ${ARG_CONFIG} "[mariadb]\nplugin-load-add=${ARG_MODULE_OUTPUT_NAME}.so\n")
           ENDIF()
-          INSTALL(FILES ${ARG_CONFIG} COMPONENT ${ARG_COMPONENT} DESTINATION ${INSTALL_SYSCONF2DIR})
           SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*" PARENT_SCOPE)
           SET(CPACK_RPM_${ARG_COMPONENT}_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/plugin-postin.sh PARENT_SCOPE)
           SET(CPACK_RPM_${ARG_COMPONENT}_POST_TRANS_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-posttrans.sh PARENT_SCOPE)
@@ -262,6 +261,9 @@ MACRO(MYSQL_ADD_PLUGIN)
       SET(ARG_COMPONENT Server)
     ENDIF()
     MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${ARG_COMPONENT})
+    IF(ARG_CONFIG AND INSTALL_SYSCONF2DIR)
+      INSTALL(FILES ${ARG_CONFIG} COMPONENT ${ARG_COMPONENT} DESTINATION ${INSTALL_SYSCONF2DIR})
+    ENDIF()
   ENDIF()
 
   GET_FILENAME_COMPONENT(subpath ${CMAKE_CURRENT_SOURCE_DIR} NAME)
diff --git a/debian/additions/mariadb.cnf b/debian/additions/mariadb.cnf
index c6fb2f781a2..8b283e21d3f 100644
--- a/debian/additions/mariadb.cnf
+++ b/debian/additions/mariadb.cnf
@@ -18,6 +18,9 @@
 #
 [client-server]
 
+socket                  = /run/mysqld/mysqld.sock
+#port                   = 3306
+
 # Import all .cnf files from configuration directory
 !includedir /etc/mysql/conf.d/
 !includedir /etc/mysql/mariadb.conf.d/
diff --git a/debian/additions/mariadb.conf.d/50-client.cnf b/debian/additions/mariadb.conf.d/50-client.cnf
index 0935b52f36e..0d1194e67db 100644
--- a/debian/additions/mariadb.conf.d/50-client.cnf
+++ b/debian/additions/mariadb.conf.d/50-client.cnf
@@ -7,9 +7,6 @@
 # Default is Latin1, if you need UTF-8 set this (also in server section)
 default-character-set = utf8mb4
 
-# socket location
-socket = /run/mysqld/mysqld.sock
-
 # Example of client certificate usage
 # ssl-cert=/etc/mysql/client-cert.pem
 # ssl-key=/etc/mysql/client-key.pem
diff --git a/debian/additions/mariadb.conf.d/50-mysql-clients.cnf b/debian/additions/mariadb.conf.d/50-mysql-clients.cnf
index 55cfda26158..2f5a3605409 100644
--- a/debian/additions/mariadb.conf.d/50-mysql-clients.cnf
+++ b/debian/additions/mariadb.conf.d/50-mysql-clients.cnf
@@ -4,8 +4,6 @@
 #
 
 [mysql]
-# Default is Latin1, if you need UTF-8 set this (also in server section)
-default-character-set = utf8mb4
 
 [mysql_upgrade]
 
diff --git a/debian/additions/mariadb.conf.d/50-mysqld_safe.cnf b/debian/additions/mariadb.conf.d/50-mysqld_safe.cnf
index 914fc1203ea..df8e82f5b3c 100644
--- a/debian/additions/mariadb.conf.d/50-mysqld_safe.cnf
+++ b/debian/additions/mariadb.conf.d/50-mysqld_safe.cnf
@@ -1,5 +1,5 @@
-# NOTE: This file is read only by the traditional SysV init script, not systemd.
-# MariaDB systemd does _not_ utilize mysqld_safe nor read this file.
+# NOTE: THIS FILE IS READ ONLY BY THE TRADITIONAL SYSV INIT SCRIPT, NOT SYSTEMD.
+# MARIADB SYSTEMD DOES _NOT_ UTILIZE MYSQLD_SAFE NOR READ THIS FILE.
 #
 # For similar behavior, systemd users should create the following file:
 # /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
@@ -22,8 +22,7 @@
 # This will be passed to all mysql clients
 # It has been reported that passwords should be enclosed with ticks/quotes
 # especially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-socket = /run/mysqld/mysqld.sock
+
 nice   = 0
 skip_log_error
 syslog
diff --git a/debian/additions/mariadb.conf.d/50-server.cnf b/debian/additions/mariadb.conf.d/50-server.cnf
index 5ac717ca6c6..6f2768cc538 100644
--- a/debian/additions/mariadb.conf.d/50-server.cnf
+++ b/debian/additions/mariadb.conf.d/50-server.cnf
@@ -14,8 +14,6 @@
 
 user                    = mysql
 pid-file                = /run/mysqld/mysqld.pid
-socket                  = /run/mysqld/mysqld.sock
-#port                   = 3306
 basedir                 = /usr
 datadir                 = /var/lib/mysql
 tmpdir                  = /tmp
diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf
deleted file mode 120000
index d7048c65c43..00000000000
--- a/debian/additions/my.cnf
+++ /dev/null
@@ -1 +0,0 @@
-mariadb.cnf
\ No newline at end of file
diff --git a/debian/mariadb-plugin-connect.install b/debian/mariadb-plugin-connect.install
index 22d73c7df05..e2500269438 100644
--- a/debian/mariadb-plugin-connect.install
+++ b/debian/mariadb-plugin-connect.install
@@ -1,2 +1,2 @@
-etc/mysql/conf.d/connect.cnf  etc/mysql/mariadb.conf.d
+etc/mysql/mariadb.conf.d/connect.cnf
 usr/lib/mysql/plugin/ha_connect.so
diff --git a/debian/mariadb-plugin-cracklib-password-check.install b/debian/mariadb-plugin-cracklib-password-check.install
index 7cc3fdc2b3e..5419f05ed3d 100644
--- a/debian/mariadb-plugin-cracklib-password-check.install
+++ b/debian/mariadb-plugin-cracklib-password-check.install
@@ -1,2 +1,2 @@
-etc/mysql/conf.d/cracklib_password_check.cnf etc/mysql/mariadb.conf.d
+etc/mysql/mariadb.conf.d/cracklib_password_check.cnf 
 usr/lib/mysql/plugin/cracklib_password_check.so
diff --git a/debian/mariadb-plugin-gssapi-server.install b/debian/mariadb-plugin-gssapi-server.install
index 537f459d2d2..70916b49052 100644
--- a/debian/mariadb-plugin-gssapi-server.install
+++ b/debian/mariadb-plugin-gssapi-server.install
@@ -1,2 +1,2 @@
-etc/mysql/conf.d/auth_gssapi.cnf etc/mysql/mariadb.conf.d
+etc/mysql/mariadb.conf.d/auth_gssapi.cnf 
 usr/lib/mysql/plugin/auth_gssapi.so
diff --git a/debian/mariadb-plugin-oqgraph.install b/debian/mariadb-plugin-oqgraph.install
index 5e2a892d9e9..675b73c5d76 100644
--- a/debian/mariadb-plugin-oqgraph.install
+++ b/debian/mariadb-plugin-oqgraph.install
@@ -1,2 +1,2 @@
-etc/mysql/conf.d/oqgraph.cnf etc/mysql/mariadb.conf.d
+etc/mysql/mariadb.conf.d/oqgraph.cnf
 usr/lib/mysql/plugin/ha_oqgraph.so
diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install
index dbfd246024b..dcc576ea937 100644
--- a/debian/mariadb-plugin-rocksdb.install
+++ b/debian/mariadb-plugin-rocksdb.install
@@ -1,4 +1,4 @@
-etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d
+etc/mysql/mariadb.conf.d/rocksdb.cnf
 usr/bin/mariadb-ldb
 usr/bin/myrocks_hotbackup
 usr/lib/mysql/plugin/ha_rocksdb.so
diff --git a/debian/mariadb-plugin-spider.install b/debian/mariadb-plugin-spider.install
index 78f2c44cbd0..1ad1361b00e 100644
--- a/debian/mariadb-plugin-spider.install
+++ b/debian/mariadb-plugin-spider.install
@@ -1,2 +1,2 @@
-etc/mysql/conf.d/spider.cnf  etc/mysql/mariadb.conf.d
+etc/mysql/mariadb.conf.d/spider.cnf
 usr/lib/mysql/plugin/ha_spider.so
diff --git a/debian/mysql-common.install b/debian/mysql-common.install
deleted file mode 100644
index 56c1c4a03f6..00000000000
--- a/debian/mysql-common.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/additions/my.cnf etc/mysql
diff --git a/debian/mysql-common.links b/debian/mysql-common.links
new file mode 100644
index 00000000000..5c45a67e4fc
--- /dev/null
+++ b/debian/mysql-common.links
@@ -0,0 +1 @@
+etc/mysql/mariadb.cnf etc/mysql/my.cnf
diff --git a/storage/spider/CMakeLists.txt b/storage/spider/CMakeLists.txt
index 2c3573c3709..397478bfc40 100644
--- a/storage/spider/CMakeLists.txt
+++ b/storage/spider/CMakeLists.txt
@@ -50,8 +50,14 @@ ELSEIF(PLUGIN_PARTITION MATCHES "^NO$")
 ELSE()
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/spider/hs_client)
 
-  MYSQL_ADD_PLUGIN(spider ${SPIDER_SOURCES}
-    STORAGE_ENGINE COMPONENT spider-engine MODULE_ONLY MODULE_OUTPUT_NAME "ha_spider")
+  IF(DEB)
+    SET(extra_options COMPONENT spider-engine)
+  ELSE()
+    SET(extra_options CONFIG spider.cnf)
+  ENDIF()
+
+  MYSQL_ADD_PLUGIN(spider ${SPIDER_SOURCES} ${extra_options}
+    STORAGE_ENGINE MODULE_ONLY)
   IF(NOT TARGET spider)
     RETURN()
   ENDIF()
diff --git a/storage/spider/spider.cnf b/storage/spider/spider.cnf
new file mode 100644
index 00000000000..2ee546962d6
--- /dev/null
+++ b/storage/spider/spider.cnf
@@ -0,0 +1,5 @@
+[mariadb]
+#
+#  uncomment the following line to enable SPIDER storage engine
+#
+#plugin-load-add=ha_spider.so