diff --git a/graphics/MesaLib18/Makefile b/graphics/MesaLib18/Makefile
index ad794ec8470a..a78faa9ce37f 100644
--- a/graphics/MesaLib18/Makefile
+++ b/graphics/MesaLib18/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2019/01/11 11:30:11 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2019/01/18 13:32:47 tnn Exp $
 
-DISTNAME=	mesa-18.3.1
-PKGREVISION=	1
+DISTNAME=	mesa-18.3.2
 PKGNAME=	${DISTNAME:S/mesa/MesaLib/}
 CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/
diff --git a/graphics/MesaLib18/distinfo b/graphics/MesaLib18/distinfo
index b7441da51e23..bec729009aae 100644
--- a/graphics/MesaLib18/distinfo
+++ b/graphics/MesaLib18/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2019/01/10 22:30:10 tnn Exp $
+$NetBSD: distinfo,v 1.8 2019/01/18 13:32:47 tnn Exp $
 
-SHA1 (mesa-18.3.1.tar.xz) = 50ba2d37647fea77ea19416e8a6ffed34c313330
-RMD160 (mesa-18.3.1.tar.xz) = 2d6dff2d0357687c164b2b87760301b97fd63653
-SHA512 (mesa-18.3.1.tar.xz) = a68d39158cf1e868d70730d0641a0cfe4c6e5b3cd1bc0c47f54022402aca03503933084f6ddc722bf88c9b6d1281ba5c847ec4fed8092a9b33f90527d08e12db
-Size (mesa-18.3.1.tar.xz) = 11865960 bytes
+SHA1 (mesa-18.3.2.tar.xz) = 8775d7bfac7e07141ac4299888d426d5550949f7
+RMD160 (mesa-18.3.2.tar.xz) = d3662f72a39d009adb21a70bd7b49c28960c0d5c
+SHA512 (mesa-18.3.2.tar.xz) = 34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6db9ca8b81283866da415e34346a4c39fc37bebe2a0929be14480faf4db45
+Size (mesa-18.3.2.tar.xz) = 11868440 bytes
 SHA1 (patch-configure.ac) = 355b04270d2036fa879215d3f58278d5d32d22da
 SHA1 (patch-include_GL_internal_dri__interface.h) = 146d2f3f3e50fc1947e8941301d9cf9d90a035e2
 SHA1 (patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c) = 1fe81a7b16e36dc9125400c20543271216a33a45
diff --git a/graphics/MesaLib18/options.mk b/graphics/MesaLib18/options.mk
index 5619980f7fa0..002fb0f65425 100644
--- a/graphics/MesaLib18/options.mk
+++ b/graphics/MesaLib18/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/01/13 12:29:28 ryoon Exp $
+# $NetBSD: options.mk,v 1.4 2019/01/18 13:32:47 tnn Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=		llvm dri
@@ -15,12 +15,7 @@ PKG_SUPPORTED_OPTIONS+=		libelf
 
 # PKG_SUGGESTED_OPTIONS+=		xvmc
 PKG_SUGGESTED_OPTIONS+=		vdpau vaapi
-
-# glesv1 and glesv2 build error on NetBSD
-# due to no table_noop_array for tls patch
-.if ${OPSYS} != "NetBSD"
 PKG_SUGGESTED_OPTIONS+=		glesv1 glesv2
-.endif
 
 PKG_SUGGESTED_OPTIONS+=		xa
 PKG_SUGGESTED_OPTIONS+=		noatexit
@@ -37,15 +32,13 @@ PKG_SUGGESTED_OPTIONS+=		llvm
 	${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" ||	\
 	${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD" ||		\
 	${OPSYS} == "Darwin"
-PKG_SUGGESTED_OPTIONS+=		dri
+# Having DRI3 compiled in by default doesn't hurt, the X server
+# will only use it if it is supported at run time.
+PKG_SUGGESTED_OPTIONS+=		dri dri3
 .endif
 
-.if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=		dri3
-.endif
 
 # Use Thread Local Storage in GLX where it is supported by Mesa and works.
-# XXX Fixme
 .if \
 	!empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) ||	\
 	!empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) ||	\
@@ -84,8 +77,7 @@ CONFIGURE_ARGS+=	--enable-dri
 CONFIGURE_ARGS+=	--enable-egl
 
 .if !empty(PKG_OPTIONS:Mdri3)
-# CFLAGS+=		-DHAVE_DRI3
-# CONFIGURE_ARGS+=	--enable-dri3
+CONFIGURE_ARGS+=	--enable-dri3
 .else # !dri3
 CONFIGURE_ARGS+=	--disable-dri3
 .endif # dri3
@@ -261,7 +253,6 @@ PLIST.radeonsi=		yes
 GALLIUM_DRIVERS+=	radeonsi
 CONFIGURE_ARGS+=	--enable-llvm
 CONFIGURE_ARGS+=	--enable-llvm-shared-libs
-# CONFIGURE_ARGS+=	--enable-r600-llvm-compiler
 
 .if !empty(PKG_OPTIONS:Mlibelf)
 .include "../../devel/libelf/buildlink3.mk"
@@ -276,7 +267,6 @@ CONFIGURE_ENV+=		ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH}
 CONFIGURE_ARGS+=	--disable-xa
 CONFIGURE_ARGS+=	--disable-llvm
 CONFIGURE_ARGS+=	--disable-llvm-shared-libs
-# CONFIGURE_ARGS+=	--disable-r600-llvm-compiler
 .endif # llvm
 
 CONFIGURE_ARGS+=	--with-gallium-drivers=${GALLIUM_DRIVERS:ts,}