diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 5e1909b34955..153111ddd62c 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xorg-server
 PORTVERSION=	1.5.3
 PORTEPOCH=	1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2
@@ -36,7 +36,8 @@ USE_XORG=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 USE_OPENSSL=	yes
 USE_PERL5_BUILD=yes
 CONFIGURE_ARGS=	--disable-dmx --disable-xvfb --disable-xnest --disable-xprint \
-		--localstatedir=/var --without-dtrace --disable-xephyr
+		--localstatedir=/var --without-dtrace --disable-xephyr \
+		--enable-record=yes --enable-xtrap=yes
 
 MAN1=		Xorg.1 \
 		Xserver.1 \
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index 11a219543338..9f3bfac0e033 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -185,6 +185,10 @@ lib/xorg/modules/extensions/libextmod.la
 lib/xorg/modules/extensions/libextmod.so
 lib/xorg/modules/extensions/libglx.la
 lib/xorg/modules/extensions/libglx.so
+lib/xorg/modules/extensions/librecord.la
+lib/xorg/modules/extensions/librecord.so
+lib/xorg/modules/extensions/libxtrap.la
+lib/xorg/modules/extensions/libxtrap.so
 lib/xorg/modules/fonts/libfreetype.la
 lib/xorg/modules/fonts/libfreetype.so
 %%ALPHA_NA%%lib/xorg/modules/libafb.la