diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index eee705a..2cc1652 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -20,6 +20,6 @@ INSTALL_TARGET=	install-strip
 ONLY_FOR_ARCHS=	i386 amd64
 
 CONFIGURE_ARGS+=--disable-udev
-CONFIGURE_ARGS+=--disable-glamor
+#CONFIGURE_ARGS+=--disable-glamor
 
 .include <bsd.port.mk>
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 0913cda7..b24c0079 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -51,7 +51,8 @@ USE_OPENSSL=	yes
 CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
 		--without-xmlto --disable-docs --disable-devel-docs \
 		--localstatedir=/var --without-dtrace --disable-xephyr \
-		--enable-record=yes --disable-dri3
+		--enable-record=yes
+CONFIGURE_ARGS+=--enable-glamor --enable-dri3
 INSTALL_TARGET=	install-strip
 
 .if ${SLAVE_PORT} == "no"
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index 40f2b45..5359cf5 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -31,6 +31,7 @@ include/xorg/dixgrabs.h
 include/xorg/dixstruct.h
 include/xorg/dri.h
 include/xorg/dri2.h
+include/xorg/dri3.h
 include/xorg/dristruct.h
 include/xorg/edid.h
 include/xorg/events.h
@@ -49,6 +50,7 @@ include/xorg/gc.h
 include/xorg/gcstruct.h
 include/xorg/geext.h
 include/xorg/geint.h
+include/xorg/glamor.h
 include/xorg/globals.h
 include/xorg/glx_extinit.h
 include/xorg/glyphstr.h
@@ -166,6 +168,7 @@ lib/xorg/modules/extensions/.xorg/libglx.so
 lib/xorg/modules/libexa.so
 lib/xorg/modules/libfb.so
 lib/xorg/modules/libfbdevhw.so
+lib/xorg/modules/libglamoregl.so
 lib/xorg/modules/libint10.so
 lib/xorg/modules/libshadow.so
 lib/xorg/modules/libshadowfb.so