diff --git a/databases/mariadb102-server/Makefile b/databases/mariadb102-server/Makefile
index d1066ec74ee7..56b5407cb08b 100644
--- a/databases/mariadb102-server/Makefile
+++ b/databases/mariadb102-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.2.17
+PORTVERSION=	10.2.18
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
@@ -187,12 +187,12 @@ post-install:
 	${RM} ${STAGEDIR}${PREFIX}/include/mysql/*.h
 .endif # defined(CLIENT_ONLY)
 
-.if defined(WITH_OPENSSL_PORT)
-GSSAPI_BASE_IGNORE=	BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
-.endif
-
 .include <bsd.port.options.mk>
 
+.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
+IGNORE=	BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
+.endif
+
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
 SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
 .else
diff --git a/databases/mariadb102-server/distinfo b/databases/mariadb102-server/distinfo
index 7c7af876361a..1637a1f28e9a 100644
--- a/databases/mariadb102-server/distinfo
+++ b/databases/mariadb102-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534231063
-SHA256 (mariadb-10.2.17.tar.gz) = e7b3078f8de874a4d451242a8a3eed49bf6f916dcd52fc3efa55886f5f35be27
-SIZE (mariadb-10.2.17.tar.gz) = 73409162
+TIMESTAMP = 1538065245
+SHA256 (mariadb-10.2.18.tar.gz) = 24cef69a81deb7c778de6b226cfedf84193133c49b22e4a37b6a454ec401fc78
+SIZE (mariadb-10.2.18.tar.gz) = 71715758
diff --git a/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc b/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc
deleted file mode 100644
index 0114e08d28ef..000000000000
--- a/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- storage/rocksdb/rocksdb/db/malloc_stats.cc.orig	2017-08-17 10:05:38 UTC
-+++ storage/rocksdb/rocksdb/db/malloc_stats.cc
-@@ -16,7 +16,12 @@
- namespace rocksdb {
- 
- #ifdef ROCKSDB_JEMALLOC
-+#ifdef __FreeBSD__
-+#include <malloc_np.h>
-+#define je_malloc_stats_print malloc_stats_print
-+#else
- #include "jemalloc/jemalloc.h"
-+#endif
- 
- typedef struct {
-   char* cur;
diff --git a/databases/mariadb102-server/pkg-plist b/databases/mariadb102-server/pkg-plist
index a9a48392a71e..c0a02b6b6475 100644
--- a/databases/mariadb102-server/pkg-plist
+++ b/databases/mariadb102-server/pkg-plist
@@ -103,7 +103,9 @@ man/man1/aria_read_log.1.gz
 man/man1/galera_new_cluster.1.gz
 man/man1/galera_recovery.1.gz
 man/man1/innochecksum.1.gz
+man/man1/mariabackup.1.gz
 man/man1/mariadb-service-convert.1.gz
+man/man1/mbstream.1.gz
 man/man1/my_print_defaults.1.gz
 man/man1/myisam_ftdump.1.gz
 man/man1/myisamchk.1.gz
@@ -113,6 +115,7 @@ man/man1/mysql.server.1.gz
 man/man1/mysql_convert_table_format.1.gz
 man/man1/mysql_fix_extensions.1.gz
 man/man1/mysql_install_db.1.gz
+man/man1/mysql_ldb.1.gz
 man/man1/mysql_secure_installation.1.gz
 man/man1/mysql_setpermission.1.gz
 man/man1/mysql_tzinfo_to_sql.1.gz
@@ -127,11 +130,13 @@ man/man1/perror.1.gz
 man/man1/replace.1.gz
 man/man1/resolve_stack_dump.1.gz
 man/man1/resolveip.1.gz
-man/man1/tokuft_logdump.1.gz
-man/man1/tokuftdump.1.gz
+%%TOKUDB%%man/man1/tokuft_logprint.1.gz
+%%TOKUDB%%man/man1/tokuftdump.1.gz
 man/man1/wsrep_sst_common.1.gz
+man/man1/wsrep_sst_mariabackup.1.gz
 man/man1/wsrep_sst_mysqldump.1.gz
 man/man1/wsrep_sst_rsync.1.gz
+man/man1/wsrep_sst_rsync_wan.1.gz
 man/man1/wsrep_sst_xtrabackup-v2.1.gz
 man/man1/wsrep_sst_xtrabackup.1.gz
 man/man8/mysqld.8.gz