diff --git a/FAQ.md b/FAQ.md
index 904490a0e..b5e644d64 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -15,7 +15,7 @@ $ mysql -u admin -padmin -h 127.0.0.1 -P6032
 Warning: Using a password on the command line interface can be insecure.
 Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 2
-Server version: 5.1.30 (ProxySQL Admin Module)
+Server version: 5.5.30 (ProxySQL Admin Module)
 
 Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
@@ -80,7 +80,7 @@ $ mysql -u test -ptest -h 127.0.0.1 -P6034
 Warning: Using a password on the command line interface can be insecure.
 Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 5
-Server version: 5.1.30 (ProxySQL Admin Module)
+Server version: 5.5.30 (ProxySQL Admin Module)
 
 Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
@@ -106,7 +106,7 @@ $ mysql -u admin -padmin -h 127.0.0.1 -P6032
 Warning: Using a password on the command line interface can be insecure.
 Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 5
-Server version: 5.1.30 (ProxySQL Admin Module)
+Server version: 5.5.30 (ProxySQL Admin Module)
 
 Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
@@ -131,7 +131,7 @@ $ mysql -u user1 -p123456 -h 127.0.0.1 -P6033
 Warning: Using a password on the command line interface can be insecure.
 Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 6
-Server version: 5.1.30 (ProxySQL)
+Server version: 5.5.30 (ProxySQL)
 
 Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp
index 3c9799d56..30fb98395 100644
--- a/lib/MySQL_Thread.cpp
+++ b/lib/MySQL_Thread.cpp
@@ -269,7 +269,7 @@ MySQL_Threads_Handler::MySQL_Threads_Handler() {
 	variables.default_schema=strdup((char *)"information_schema");
 	variables.default_charset=33;
 	variables.interfaces=strdup((char *)"");
-	variables.server_version=strdup((char *)"5.1.30");
+	variables.server_version=strdup((char *)"5.5.30");
 	variables.eventslog_filename=strdup((char *)""); // proxysql-mysql-eventslog is recommended
 	variables.eventslog_filesize=100*1024*1024;
 //	variables.server_capabilities=CLIENT_FOUND_ROWS | CLIENT_PROTOCOL_41 | CLIENT_IGNORE_SIGPIPE | CLIENT_TRANSACTIONS | CLIENT_SECURE_CONNECTION | CLIENT_CONNECT_WITH_DB | CLIENT_SSL;
@@ -1116,7 +1116,11 @@ bool MySQL_Threads_Handler::set_variable(char *name, char *value) {	// this is t
 	if (!strcasecmp(name,"server_version")) {
 		if (vallen) {
 			free(variables.server_version);
-			variables.server_version=strdup(value);
+			if (strcmp(value,(const char *)"5.1.30")==0) { // per issue #632 , the default 5.1.30 is replaced with 5.5.30
+				variables.server_version=strdup((char *)"5.5.30");
+			} else {
+				variables.server_version=strdup(value);
+			}
 			return true;
 		} else {
 			return false;
diff --git a/src/proxysql.cfg b/src/proxysql.cfg
index 58a46f485..bc4bb9bd2 100644
--- a/src/proxysql.cfg
+++ b/src/proxysql.cfg
@@ -28,7 +28,7 @@ mysql_variables=
 	interfaces="0.0.0.0:6033"
 	default_schema="information_schema"
 	stacksize=1048576
-	server_version="5.1.30"
+	server_version="5.5.30"
 	connect_timeout_server=10000
 	monitor_history=60000
 	monitor_connect_interval=200000