diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 5db46e3c24e0..15c8455d724c 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -1,153 +1,154 @@
 # Created by: Jason Helfman <jgh@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libvirt
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.1
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Toolkit to interact with virtualization capabilities
 
 LICENSE=	LGPL3
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libxml2.so:${PORTSDIR}/textproc/libxml2 \
 		libgnutls.so:${PORTSDIR}/security/gnutls \
 		libssh2.so:${PORTSDIR}/security/libssh2
 BUILD_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dnsmasq \
 		xsltproc:${PORTSDIR}/textproc/libxslt
 RUN_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dnsmasq \
 		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
 .else
 PLIST_SUB+=		BHYVE="@comment "
 CONFIGURE_ARGS+=	--without-bhyve
 .endif
 QEMU_DESC=	QEMU driver
 BHYVE_DESC=	bhyve driver
 XEN_DESC=	Xen support via libxl
 
 OPTIONS_SUB=	yes
 
 BHYVE_CONFIGURE_WITH=	bhyve
 
 QEMU_CONFIGURE_WITH=	qemu yajl
 QEMU_CFLAGS=	-I${LOCALBASE}/include
 QEMU_LIB_DEPENDS=	libyajl.so:${PORTSDIR}/devel/yajl
 QEMU_RUN_DEPENDS=	dmidecode:${PORTSDIR}/sysutils/dmidecode \
 			qemu-io:${PORTSDIR}/emulators/qemu-devel
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
 
 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 virtlogd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--without-avahi \
 		--without-polkit \
 		--without-hal \
 		--without-udev \
 		--without-netcf \
 		--without-sysctl \
 		--without-lxc \
 		--without-uml \
 		--without-xen \
+		--without-login-shell \
 		--with-ssh2 \
 		--localstatedir=${VARDIR}
 
 # random_data fix can be removed when 8.x is eol
 CONFIGURE_ENV=	ac_cv_type_struct_random_data=""
 
 # limit production release x.x.x
 PORTSCOUT=	limit:\d+\.\d+\.\d+$$
 
 LDFLAGS+=	-L${LOCALBASE}/lib -fstack-protector
 
 USES=		charsetfix cpe gmake libtool pathfix perl5 pkgconfig
 CPE_VENDOR=	redhat
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 SHLIB_VER=	0.1003.${PORTVERSION:E}
 PLIST_SUB+=	PORTVERSION="-${PORTVERSION}" \
 		SHLIB_VER=${SHLIB_VER}
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
 
 .if !${PLIST_SUB:MXEN}
 PLIST_SUB+=     XEN="@comment "
 .endif
 
 CONF_FILES=	\
 		libvirt-admin.conf \
 		libvirt.conf \
 		libvirtd.conf \
 		libxl.conf \
 		qemu.conf \
 		virtlockd.conf \
 	   	virtlogd.conf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|ln -s ../default.xml|true|' \
 			  -e 's|$$(DESTDIR)$$(confdir)/qemu/networks|${STAGEDIR}${EXAMPLESDIR}/networks|' \
 			  ${WRKSRC}/src/Makefile.in
 
 	@${REINPLACE_CMD} -e 's|cp $$(DESTDIR)|cp -f $$(DESTDIR)|' \
 		${WRKSRC}/src/Makefile.in
 
 post-install:
 	@${RMDIR} ${STAGEDIR}${EXAMPLESDIR}/networks/autostart
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/qemu/networks/autostart
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in AUTHORS ChangeLog INSTALL NEWS README TODO
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .for dir in run/libvirt/network \
 	run/libvirt/qemu \
 	run/libvirt/lockd \
 	log/libvirt/uml \
 	log/libvirt/qemu \
 	log/libvirt/lxc \
 	lib/libvirt/boot \
 	lib/libvirt/lockd/files \
 	lib/libvirt/images \
 	lib/libvirt/dnsmasq \
 	lib/libvirt/filesystems \
 	lib/libvirt/network \
 	lib/libvirt/qemu/channel/target \
 	cache/libvirt/qemu
 	@${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}"
 .endfor
 
 .for file in ${CONF_FILES}
 	@if test -f ${STAGEDIR}${ETCDIR}/${file}; then \
 		${MV} ${STAGEDIR}${ETCDIR}/${file} \
 		${STAGEDIR}${ETCDIR}/${file}.sample; fi
 .endfor
 
 regression-test: build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.mk>
diff --git a/devel/libvirt/distinfo b/devel/libvirt/distinfo
index 35c8cd02881f..91e5ec7bdf6e 100644
--- a/devel/libvirt/distinfo
+++ b/devel/libvirt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvirt-1.3.0.tar.gz) = ebcf5645fa565e3fe2fe94a86e841db9b768cf0e0a7e6cf395c6327f9a23bd64
-SIZE (libvirt-1.3.0.tar.gz) = 30114683
+SHA256 (libvirt-1.3.1.tar.gz) = a5d43fbed34d31eeffc641d2ac9b6026a57bf1a4fa74d0fa19a9891d9ec2c21a
+SIZE (libvirt-1.3.1.tar.gz) = 29900143
diff --git a/devel/libvirt/files/patch-CVE-2015-5313 b/devel/libvirt/files/patch-CVE-2015-5313
deleted file mode 100644
index ad1037cddffa..000000000000
--- a/devel/libvirt/files/patch-CVE-2015-5313
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/storage/storage_backend_fs.c
-+++ src/storage/storage_backend_fs.c
-@@ -1,7 +1,7 @@
- /*
-  * storage_backend_fs.c: storage backend for FS and directory handling
-  *
-- * Copyright (C) 2007-2014 Red Hat, Inc.
-+ * Copyright (C) 2007-2015 Red Hat, Inc.
-  * Copyright (C) 2007-2008 Daniel P. Berrange
-  *
-  * This library is free software; you can redistribute it and/or
-@@ -1057,6 +1057,14 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn ATTRIBUTE_UNUSED,
-     else
-         vol->type = VIR_STORAGE_VOL_FILE;
- 
-+    /* Volumes within a directory pools are not recursive; do not
-+     * allow escape to ../ or a subdir */
-+    if (strchr(vol->name, '/')) {
-+        virReportError(VIR_ERR_OPERATION_INVALID,
-+                       _("volume name '%s' cannot contain '/'"), vol->name);
-+        return -1;
-+    }
-+
-     VIR_FREE(vol->target.path);
-     if (virAsprintf(&vol->target.path, "%s/%s",
-                     pool->def->target.path,