diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f66af9e..3c5157f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,7 @@ INCLUDE("${CMAKE_SOURCE_DIR}/cmake/install.cmake")
 # todo: we don't character sets in share - all is compiled in
 SET(SHAREDIR "share")
 SET(DEFAULT_CHARSET_HOME "${CMAKE_INSTALL_PREFIX}")
-SET(PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/plugin")
+# SET(MARIADB_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/plugin")
 
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/SearchLibrary.cmake)
 
diff --git a/cmake/plugins.cmake b/cmake/plugins.cmake
index 1b2be2ca..96ed0296 100644
--- a/cmake/plugins.cmake
+++ b/cmake/plugins.cmake
@@ -32,7 +32,7 @@ ENDIF()
 
 # AUTHENTICATION
 REGISTER_PLUGIN("AUTH_NATIVE" "${CMAKE_SOURCE_DIR}/plugins/auth/my_auth.c" "native_password_client_plugin" "STATIC" "" 0)
-REGISTER_PLUGIN("AUTH_OLDPASSWORD" "${CMAKE_SOURCE_DIR}/plugins/auth/old_password.c" "old_password_client_plugin" "DYNAMIC" "mysql_old_password" 1)
+REGISTER_PLUGIN("AUTH_OLDPASSWORD" "${CMAKE_SOURCE_DIR}/plugins/auth/old_password.c" "old_password_client_plugin" "STATIC" "" 1)
 REGISTER_PLUGIN("AUTH_DIALOG" "${CMAKE_SOURCE_DIR}/plugins/auth/dialog.c" "auth_dialog_plugin" "DYNAMIC" dialog 1)
 REGISTER_PLUGIN("AUTH_CLEARTEXT" "${CMAKE_SOURCE_DIR}/plugins/auth/mariadb_clear_text.c" "auth_cleartext_plugin" "DYNAMIC" "mysql_clear_password" 1)
 IF(WIN32)
@@ -82,6 +82,7 @@ FOREACH(PLUGIN ${PLUGINS})
   MESSAGE(STATUS "${PLUGIN}: ${${PLUGIN}_PLUGIN_TYPE}")
   MARK_AS_ADVANCED(${PLUGIN}_PLUGIN_TYPE)
 ENDFOREACH()
+MESSAGE(STATUS "STATIC PLUGIN SOURCES: ${LIBMARIADB_SOURCES}")
 
 IF(NOT REMOTEIO_PLUGIN_TYPE MATCHES "NO")
   FIND_PACKAGE(CURL)
diff --git a/include/ma_config.h.in b/include/ma_config.h.in
index fb07d3fa..0d4dd3ee 100644
--- a/include/ma_config.h.in
+++ b/include/ma_config.h.in
@@ -275,5 +275,5 @@
 #cmakedefine HAVE_THREADS 1
 #cmakedefine SHAREDIR "@SHAREDIR@"
 #cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@"
-#cmakedefine MARIADB_PLUGINDIR "@PREFIX_INSTALL_DIR@/@PLUGIN_INSTALL_DIR@"
+#define MARIADB_PLUGINDIR "@PREFIX_INSTALL_DIR@/@PLUGIN_INSTALL_DIR@"
 
diff --git a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in
index 227cfa56..d5cece6c 100644
--- a/mariadb_config/mariadb_config.c.in
+++ b/mariadb_config/mariadb_config.c.in
@@ -10,10 +10,10 @@ static char *mariadb_progname;
                 "@extra_dynamic_LDFLAGS@"
 #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
 #define CFLAGS  INCLUDE " @CMAKE_C_FLAGS@"
-#define VERSION "@MYSQL_CLIENT_VERSION@"
+#define VERSION "@MARIADB_CLIENT_VERSION@"
 #define PLUGIN_DIR "@PREFIX_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/@PLUGIN_INSTALL_DIR@"
-#define SOCKET  "@MYSQL_UNIX_ADDR@"
-#define PORT "@MYSQL_PORT@"
+#define SOCKET  "@MARIADBL_UNIX_ADDR@"
+#define PORT "@MARIADB_PORT@"
 
 static struct option long_options[]=
 {
@@ -99,7 +99,7 @@ int main(int argc, char **argv)
       puts(PORT);
       break;
     case 'p':
-      puts(PLUGINDIR);
+      puts(MARIADB_PLUGINDIR);
       break;
     case 'y':
       puts(LIBS_SYS);
diff --git a/plugins/auth/old_password.c b/plugins/auth/old_password.c
index 2742848d..599a25cf 100644
--- a/plugins/auth/old_password.c
+++ b/plugins/auth/old_password.c
@@ -47,7 +47,7 @@ typedef struct {
 } MCPVIO_EXT;
 
 #ifndef HAVE_OLDPASSWORD_DYNAMIC
-struct st_mysql_client_plugin_AUTHENTICATION auth_old_password_plugin=
+struct st_mysql_client_plugin_AUTHENTICATION old_password_client_plugin=
 #else
 struct st_mysql_client_plugin_AUTHENTICATION _mysql_client_plugin_declaration_ =
 #endif