Index: Makefile
===================================================================
--- Makefile	(revision 397256)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvirt
 PORTVERSION=	1.2.19
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
@@ -23,12 +24,14 @@
 		dmidecode:${PORTSDIR}/sysutils/dmidecode
 
 OPTIONS_DEFINE=	DOCS NLS QEMU SASL
+OPTIONS_DEFINE_amd64=	XEN
 .if exists(/usr/sbin/bhyve)
-OPTIONS_DEFINE_amd64=	BHYVE
-OPTIONS_DEFAULT_amd64=	BHYVE
+OPTIONS_DEFINE_amd64+=	BHYVE
+OPTIONS_DEFAULT_amd64+=	BHYVE
 .endif
 QEMU_DESC=	QEMU driver
 BHYVE_DESC=	bhyve driver
+XEN_DESC=	Xen support via libxl
 
 OPTIONS_SUB=	yes
 
@@ -45,6 +48,10 @@
 SASL_CONFIGURE_WITH=	sasl
 SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 
+XEN_CONFIGURE_WITH=	libxl
+XEN_CFLAGS=	-I${LOCALBASE}/include
+XEN_LIB_DEPENDS=	libxenlight.so:${PORTSDIR}/sysutils/xen-tools
+
 VARDIR=		/var
 
 USE_RC_SUBR=	libvirtd
@@ -59,7 +66,6 @@
 		--without-lxc \
 		--without-uml \
 		--without-xen \
-		--without-libxl \
 		--with-ssh2 \
 		--localstatedir=${VARDIR}
 
@@ -113,6 +119,12 @@
 	@${REINPLACE_CMD} -e 's|qemu.conf$$|qemu.conf.sample|' \
 		${WRKSRC}/src/Makefile.in
 
+	@${MV} ${WRKSRC}/src/libxl/libxl.conf ${WRKSRC}/src/libxl/libxl.conf.sample
+	@${REINPLACE_CMD} -e 's|libxl.conf |libxl.conf.sample |' \
+		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|libxl.conf$$|libxl.conf.sample|' \
+		${WRKSRC}/src/Makefile.in
+
 	@${REINPLACE_CMD} -e 's|cp $$(DESTDIR)|cp -f $$(DESTDIR)|' \
 		${WRKSRC}/src/Makefile.in
 
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 397256)
+++ pkg-plist	(working copy)
@@ -11,10 +11,12 @@
 @sample %%ETCDIR%%/libvirt.conf.sample
 @sample %%ETCDIR%%/libvirtd.conf.sample
 %%QEMU%%@sample %%ETCDIR%%/qemu.conf.sample
+%%XEN%%@sample %%ETCDIR%%/libxl.conf.sample
 %%ETCDIR%%/virtlockd.conf
 %%ETCDIR%%/qemu/networks/default.xml
 %%ETCDIR%%/qemu/networks/autostart/default.xml
 %%QEMU%%%%ETCDIR%%/qemu-lockd.conf
+%%XEN%%%%ETCDIR%%/libxl-lockd.conf
 etc/logrotate.d/libvirtd
 etc/logrotate.d/libvirtd.lxc
 etc/logrotate.d/libvirtd.qemu
@@ -64,6 +66,8 @@
 share/augeas/lenses/tests/test_libvirtd.aug
 share/augeas/lenses/tests/test_virtlockd.aug
 %%QEMU%%share/augeas/lenses/tests/test_libvirtd_qemu.aug
+%%XEN%%share/augeas/lenses/libvirtd_libxl.aug
+%%XEN%%share/augeas/lenses/tests/test_libvirtd_libxl.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/32favicon.png
 %%DOCSDIR%%%%PORTVERSION%%/html/404.html
 %%DOCSDIR%%%%PORTVERSION%%/html/acl.html
@@ -287,11 +291,15 @@
 lib/libvirt/connection-driver/libvirt_driver_secret.so
 lib/libvirt/connection-driver/libvirt_driver_storage.so
 lib/libvirt/connection-driver/libvirt_driver_vbox.so
+%%XEN%%lib/libvirt/connection-driver/libvirt_driver_libxl.so
 %%QEMU%%@dir /var/run/libvirt/qemu
 %%QEMU%%@dir /var/lib/libvirt/qemu/channel/target
 %%QEMU%%@dir /var/lib/libvirt/qemu/channel
 %%QEMU%%@dir /var/lib/libvirt/qemu
 %%QEMU%%@dir /var/cache/libvirt/qemu
+%%XEN%%@dir /var/lib/libvirt/libxl
+%%XEN%%@dir /var/log/libvirt/libxl
+%%XEN%%@dir /var/run/libvirt/libxl
 @dir /var/cache/libvirt
 @dir /var/lib/libvirt/boot
 @dir /var/lib/libvirt/dnsmasq