Index: multimedia/xbmc/Makefile
===================================================================
--- multimedia/xbmc/Makefile	(revision 338647)
+++ multimedia/xbmc/Makefile	(working copy)
@@ -55,7 +55,7 @@
 USES=		gmake iconv pkgconfig
 USE_AUTOTOOLS=	autoconf libtool automake libltdl
 GNU_CONFIGURE=	yes
-USE_XORG=	xt xmu xrandr xtst
+USE_XORG=	xt xmu xtst
 USE_GL=		glu
 USE_SDL=	image sdl
 USE_PYTHON=	-2.7
@@ -75,7 +75,7 @@
 
 OPTIONS_DEFINE=	AIRPLAY AIRTUNES AVAHI CEC EXTERNAL_FFMPEG LAME \
 		LIBBLURAY HAL LIRC MYSQL NONFREE PULSEAUDIO RTMP SFTP \
-		SMB VAAPI VDPAU VORBIS WEBSERVER
+		SMB VAAPI VDPAU VORBIS WEBSERVER XRANDR
 AIRPLAY_DESC=	AirPlay support via libplist
 AIRTUNES_DESC=	AirTunes support via libshairport
 CEC_DESC=	CEC adapter support
@@ -85,7 +85,7 @@
 VORBIS_DESC=	Ogg Vorbis audio encoder
 
 OPTIONS_DEFAULT=	AIRPLAY AVAHI CEC LIBBLURAY HAL MYSQL \
-			RTMP SFTP SMB VORBIS WEBSERVER
+			RTMP SFTP SMB VORBIS WEBSERVER XRANDR
 
 .include <bsd.port.pre.mk>
 
@@ -146,6 +146,15 @@
 CONFIGURE_ARGS+=	--disable-libcec
 .endif
 
+.if ${PORT_OPTIONS:MXRANDR}
+CONFIGURE_ARGS+=	--enable-xrandr
+USE_XORG+=	xrandr
+PLIST_SUB+=	XRANDR=""
+.else
+CONFIGURE_ARGS+=	--disable-xrandr
+PLIST_SUB+=	XRANDR="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MEXTERNAL_FFMPEG}
 CONFIGURE_ARGS+=	--enable-external-ffmpeg
 FFMPEG_SUFFIX=	0
Index: multimedia/xbmc/pkg-plist
===================================================================
--- multimedia/xbmc/pkg-plist	(revision 338647)
+++ multimedia/xbmc/pkg-plist	(working copy)
@@ -29,7 +29,7 @@
 lib/xbmc/system/players/paplayer/stsoundlibrary-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/paplayer/timidity-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/paplayer/vgmstream-%%ARCH%%-freebsd.so
-lib/xbmc/xbmc-xrandr
+%%XRANDR%%lib/xbmc/xbmc-xrandr
 lib/xbmc/xbmc.bin
 man/man1/xbmc.bin.1.gz
 man/man1/xbmc.1.gz