Index: branches/2016Q1/multimedia/emby-server/Makefile
===================================================================
--- branches/2016Q1/multimedia/emby-server/Makefile	(revision 408866)
+++ branches/2016Q1/multimedia/emby-server/Makefile	(revision 408867)
@@ -1,46 +1,49 @@
 # Created by: Ben Woods <woodsb02@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	emby-server
 PORTVERSION=	3.0.5781.2
 CATEGORIES=	multimedia
 
 MAINTAINER=	woodsb02@gmail.com
 COMMENT=	Home media server built using mono and other open source technologies
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
-		libmediainfo.so:${PORTSDIR}/multimedia/libmediainfo \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick-nox11
+		libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
 CONFLICTS_INSTALL=	mediabrowser
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MediaBrowser
 GH_PROJECT=	Emby
 
 USES=		mono pkgconfig
 
 USE_RC_SUBR=	${PORTNAME}
 RC_NAME=	emby_server
 SUB_LIST=	PORTNAME=${PORTNAME} USER=${USERS} GROUP=${GROUPS} RC_NAME=${RC_NAME}
 USERS=		emby
 GROUPS=		emby
+
+OPTIONS_DEFINE=		X11
+OPTIONS_DEFAULT=	X11
+X11_LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+X11_LIB_DEPENDS_OFF=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick-nox11
 
 do-build:
 	(cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/xbuild /t:build /p:Configuration="Release Mono" \
 			/p:Platform="Any CPU" MediaBrowser.Mono.sln)
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server
 	(cd ${WRKSRC}/MediaBrowser.Server.Mono/bin/Release\ Mono && \
 		${ECHO_MSG} "Deleting the following non-FreeBSD library files:" && \
 		${FIND} -E . -iregex '(.*\.dylib|.*libwebp.*|.*sqlite3.*|.*.dylib.*|MediaInfo\.dll)' -print -delete && \
 		${FIND} . -type d -empty -print -delete && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/emby-server)
 
 .include <bsd.port.mk>
Index: branches/2016Q1/multimedia/emby-server/pkg-message
===================================================================
--- branches/2016Q1/multimedia/emby-server/pkg-message	(revision 408866)
+++ branches/2016Q1/multimedia/emby-server/pkg-message	(revision 408867)
@@ -1,19 +1,30 @@
-Emby Server uses ffmpeg for transcoding, which by default has
-lame support disabled due to licensing issues. To enable mp3
-audio when transcoding, you must reinstall multimedia/ffmpeg
-from ports with the lame support option enabled.
+Emby Server uses FFmpeg for transcoding and ImageMagick for
+generating thumbnails. The default ports/pkg builds of FFmpeg
+and ImageMagick on FreeBSD have a number of options which
+could be SET/UNSET to improve your Emby Server experience.
+
+It is recommended to recompile the multimedia/ffmpeg package
+from ports with the following options ENABLED (SET):
+ - ASS (required for subtitle rendering)
+ - LAME (required for mp3 audio transcoding, disabled by default due to mp3 licensing restrictions)
+ - OPUS (required for opus audio codec support)
+ - X265 (required for H.265 video codec support
+
+It is recommended to recompile the graphics/ImageMagick package
+from ports with the following options DISABLED (UNSET):
+ - 16BIT_PIXEL (to increase thumbnail generation performance)
 
 If you had mediabrowser installed before the project was
 renamed to emby-server, you may want to rename the user and
 group (note that moving the database is not supported):
 # pw groupmod 989 -n mediabrowser -l emby
 # pw usermod 989 -n mediabrowser -l emby -g emby -c Emby\ Server
 
 To automatically start Emby Server at boot time:
 # echo 'emby_server_enable="YES"' >> /etc/rc.conf
 
 To then manually start Emby Server without rebooting:
 # service emby-server start
 
 Once started, visit the following webpage to configure:
 http://localhost:8096/