diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile
index 44b93fe..027aca9 100644
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: head/databases/mariadb55-server/Makefile 314960 2013-03-22 20:06:14Z makc $
 
 PORTNAME?=	mariadb
-PORTVERSION=	5.5.30
+PORTVERSION=	5.5.31
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
diff --git a/databases/mariadb55-server/distinfo b/databases/mariadb55-server/distinfo
index 4e1086c..dd12e77 100644
--- a/databases/mariadb55-server/distinfo
+++ b/databases/mariadb55-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mariadb-5.5.30.tar.gz) = 64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f
-SIZE (mariadb-5.5.30.tar.gz) = 27875216
+SHA256 (mariadb-5.5.31.tar.gz) = 70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28
+SIZE (mariadb-5.5.31.tar.gz) = 27888530
diff --git a/databases/mariadb55-server/files/patch-sql_CMakeLists.txt b/databases/mariadb55-server/files/patch-sql_CMakeLists.txt
index af5a856..47e93ad 100644
--- a/databases/mariadb55-server/files/patch-sql_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-sql_CMakeLists.txt
@@ -1,14 +1,14 @@
---- sql/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
-+++ sql/CMakeLists.txt	2012-12-23 05:56:58.000000000 +0200
+--- sql/CMakeLists.txt.orig	2013-05-22 01:09:51.000000000 +0300
++++ sql/CMakeLists.txt	2013-06-08 14:13:06.000000000 +0300
 @@ -268,6 +268,7 @@
+   VERBATIM
+   )
  
 +IF(FALSE)
  IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
  
- # We need to create empty directories (data/test) the installation.  
- # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767
- # Avoid completely empty directories and install dummy file instead.
-@@ -313,6 +314,7 @@
+ # Copy db.opt into data/test/
+@@ -311,6 +312,7 @@
    INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
  ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
  ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
@@ -16,7 +16,7 @@
  
  IF(WIN32)
    SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
-@@ -354,8 +356,10 @@
+@@ -353,8 +355,10 @@
    TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
  ENDIF(WIN32)
  
diff --git a/databases/mariadb55-server/pkg-plist b/databases/mariadb55-server/pkg-plist
index 754b5f4..a7f2c49 100644
--- a/databases/mariadb55-server/pkg-plist
+++ b/databases/mariadb55-server/pkg-plist
@@ -33,6 +33,7 @@ lib/mysql/libmysqld.a
 lib/mysql/libmysqld.so
 lib/mysql/libmysqld.so.18
 lib/mysql/plugin/adt_null.so
+lib/mysql/plugin/auth_0x0100.so
 lib/mysql/plugin/auth_pam.so
 lib/mysql/plugin/auth_test_plugin.so
 lib/mysql/plugin/daemon_example.ini
@@ -53,6 +54,7 @@ lib/mysql/plugin/mysql_clear_password.so
 lib/mysql/plugin/qa_auth_client.so
 lib/mysql/plugin/qa_auth_interface.so
 lib/mysql/plugin/qa_auth_server.so
+lib/mysql/plugin/query_cache_info.so
 lib/mysql/plugin/semisync_master.so
 lib/mysql/plugin/semisync_slave.so
 lib/mysql/plugin/sql_errlog.so