diff --git a/configure.ac b/configure.ac
index 7a1b219ec..1f31c9429 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,6 +138,11 @@ AC_PATH_PROGS(MYSQL_CONFIG, mysql_config, mysql_config, $PATH)
 	    MYSQL_INCLUDES="`$MYSQL_CONFIG --cflags`"
         MYSQL_LIBS="`$MYSQL_CONFIG --libs_r`"
 	CXXFLAGS="-DDO_MYSQL $CXXFLAGS"
+	# Workaround for --as-needed linker flag that comes sometimes from mysql
+	if echo $MYSQL_LIBS|grep "\-Wl,--as-needed" > /dev/null; then
+		MYSQL_LIBS=`echo $MYSQL_LIBS|sed -e "s/-Wl,--as-needed//"`;
+		AC_MSG_WARN([Your mysql libs contains -Wl,--as-needed, this is not good, problem fixed in more recent mysql versions])
+	fi
     fi
 else
 AC_MSG_RESULT($DO_MYSQL)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 5b279f6f2..740b8a0bb 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8288"
+ #define REVISION_NR "8289"
 #endif // __REVISION_NR_H__