diff --git a/CMakeLists.txt b/CMakeLists.txt
index 746e4a8b..1f66af9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,18 +122,18 @@ ENDIF()
 # various defines for generating include/mysql_version.h
 
 SET(PROTOCOL_VERSION 10) # we adapted new password option from PHP's mysqlnd !
-SET(MYSQL_CLIENT_VERSION_MAJOR "10")
-SET(MYSQL_CLIENT_VERSION_MINOR "1")
-SET(MYSQL_CLIENT_VERSION_PATCH "7")
-SET(MYSQL_CLIENT_VERSION "${MYSQL_CLIENT_VERSION_MAJOR}.${MYSQL_CLIENT_VERSION_MINOR}.${MYSQL_CLIENT_VERSION_PATCH}")
-MATH(EXPR MYSQL_VERSION_ID "${MYSQL_CLIENT_VERSION_MAJOR} * 10000 +
-                            ${MYSQL_CLIENT_VERSION_MINOR} * 100   +
-                            ${MYSQL_CLIENT_VERSION_PATCH}")
-IF (NOT MYSQL_PORT)
-  SET(MYSQL_PORT 3306)
+SET(MARIADB_CLIENT_VERSION_MAJOR "10")
+SET(MARIADB_CLIENT_VERSION_MINOR "1")
+SET(MARIADB_CLIENT_VERSION_PATCH "7")
+SET(MARIADB_CLIENT_VERSION "${MARIADB_CLIENT_VERSION_MAJOR}.${MARIADB_CLIENT_VERSION_MINOR}.${MARIADB_CLIENT_VERSION_PATCH}")
+MATH(EXPR MARIADB_VERSION_ID "${MARIADB_CLIENT_VERSION_MAJOR} * 10000 +
+                              ${MARIADB_CLIENT_VERSION_MINOR} * 100   +
+                              ${MARIADB_CLIENT_VERSION_PATCH}")
+IF (NOT MARIADB_PORT)
+  SET(MARIADB_PORT 3306)
 ENDIF ()
-IF(NOT MYSQL_UNIX_ADDR)
-  SET(MYSQL_UNIX_ADDR "/tmp/mysql.sock")
+IF(NOT MARIADB_UNIX_ADDR)
+  SET(MARIADB_UNIX_ADDR "/tmp/mysql.sock")
 ENDIF()
 
 INCLUDE("${CMAKE_SOURCE_DIR}/cmake/install.cmake")
diff --git a/include/mariadb_com.h b/include/mariadb_com.h
index 15e0043c..5a6a159e 100644
--- a/include/mariadb_com.h
+++ b/include/mariadb_com.h
@@ -44,7 +44,7 @@
 #define LOCAL_HOST_NAMEDPIPE "."
 
 #if defined(_WIN32) && !defined( _CUSTOMCONFIG_)
-#define MYSQL_NAMEDPIPE "MySQL"
+#define MARIADB_NAMEDPIPE "MySQL"
 #define MYSQL_SERVICENAME "MySql"
 #endif /* _WIN32 */
 
diff --git a/include/mariadb_version.h.in b/include/mariadb_version.h.in
index d0fa54f8..1af000d7 100644
--- a/include/mariadb_version.h.in
+++ b/include/mariadb_version.h.in
@@ -10,13 +10,10 @@
 #include <custom_conf.h>
 #else
 #define PROTOCOL_VERSION		@PROTOCOL_VERSION@
-#define MYSQL_CLIENT_VERSION		"@MYSQL_CLIENT_VERSION@"
-#define MYSQL_SERVER_VERSION		"@MYSQL_CLIENT_VERSION@"
-#define MYSQL_SERVER_SUFFIX		"@MYSQL_SERVER_SUFFIX@"
-#define FRM_VER				@DOT_FRM_VERSION@
-#define MYSQL_VERSION_ID		@MYSQL_VERSION_ID@
-#define MYSQL_PORT			@MYSQL_PORT@
-#define MYSQL_UNIX_ADDR			"@MYSQL_UNIX_ADDR@"
+#define MARIADB_CLIENT_VERSION_STR	"@MARIADB_CLIENT_VERSION@"
+#define MARIADB_VERSION_ID		@MARIADB_VERSION_ID@
+#define MARIADB_PORT	        	@MARIADB_PORT@
+#define MARIADB_UNIX_ADDR               "@MARIADB_UNIX_ADDR@"
 #define MYSQL_CONFIG_NAME		"my"
 
 #define MARIADB_PACKAGE_VERSION "@CPACK_PACKAGE_VERSION@"
diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index b2a56f3e..2a61cf53 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -2365,7 +2365,7 @@ mysql_get_proto_info(MYSQL *mysql)
 const char * STDCALL
 mysql_get_client_info(void)
 {
-  return (char*) MYSQL_CLIENT_VERSION;
+  return (char*) MARIADB_CLIENT_VERSION_STR;
 }
 
 static size_t get_store_length(size_t length)
@@ -3265,7 +3265,7 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
       struct servent *serv_ptr;
       char *env;
 
-	    mysql_port = MYSQL_PORT;
+      mysql_port = MARIADB_PORT;
       if ((serv_ptr = getservbyname("mysql", "tcp")))
         mysql_port = (uint) ntohs((ushort) serv_ptr->s_port);
       if ((env = getenv("MYSQL_TCP_PORT")))
@@ -3275,11 +3275,12 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
     {
       char *env;
 #ifdef _WIN32
-      mysql_unix_port = (char*) MYSQL_NAMEDPIPE;
+      mysql_unix_port = (char*) MARIADB_NAMEDPIPE;
 #else
-      mysql_unix_port = (char*) MYSQL_UNIX_ADDR;
+      mysql_unix_port = (char*) MARIADB_UNIX_ADDR;
 #endif
-      if ((env = getenv("MYSQL_UNIX_PORT")))
+      if ((env = getenv("MYSQL_UNIX_PORT")) ||
+          (env = getenv("MARIADB_UNIX_PORT")))
         mysql_unix_port = env;
     }
   }
@@ -3328,7 +3329,7 @@ int STDCALL mysql_set_server_option(MYSQL *mysql,
 
 ulong STDCALL mysql_get_client_version(void)
 {
-  return MYSQL_VERSION_ID;
+  return MARIADB_VERSION_ID;
 }
 
 ulong STDCALL mysql_hex_string(char *to, const char *from, size_t len)
@@ -3464,10 +3465,10 @@ my_bool STDCALL mariadb_get_infov(MYSQL *mysql, enum mariadb_value value, void *
 #endif
     break;
   case MARIADB_CLIENT_VERSION:
-    *((char **)arg)= MYSQL_CLIENT_VERSION;
+    *((char **)arg)= MARIADB_CLIENT_VERSION_STR;
     break;
   case MARIADB_CLIENT_VERSION_ID:
-    *((size_t *)arg)= MYSQL_VERSION_ID;
+    *((size_t *)arg)= MARIADB_VERSION_ID;
     break;
   case MARIADB_CONNECTION_SERVER_VERSION:
     if (mysql)
diff --git a/mariadb_config/CMakeLists.txt b/mariadb_config/CMakeLists.txt
index 4c8d973d..8fbe9c4f 100644
--- a/mariadb_config/CMakeLists.txt
+++ b/mariadb_config/CMakeLists.txt
@@ -23,6 +23,8 @@ FOREACH (LIB_NAME ${SYSTEM_LIBS})
   GET_LIB_NAME(${LIB_NAME} LIB_OUT)
   SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} ${LIB_OUT}")
 ENDFOREACH()
+STRING(STRIP ${extra_dynamic_LDFLAGS} extra_dynamic_LDFLAGS)
+
 
 IF(UNIX)
   IF(ICONV_EXTERNAL)