diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index e6bcabadb4f6..a5b20d32c1bd 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvirt
-PORTVERSION=	2.3.0
+PORTVERSION=	2.4.0
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
@@ -21,8 +21,8 @@ BUILD_DEPENDS=	dnsmasq:dns/dnsmasq \
 RUN_DEPENDS=	dnsmasq:dns/dnsmasq \
 		dmidecode:sysutils/dmidecode
 
-OPTIONS_DEFINE=	DOCS GNUTLS NLS NSS QEMU SASL
-OPTIONS_DEFAULT=	GNUTLS
+OPTIONS_DEFINE=	DOCS GNUTLS NLS NSS QEMU READLINE SASL
+OPTIONS_DEFAULT=	GNUTLS READLINE
 OPTIONS_DEFINE_amd64=	XEN
 .if exists(/usr/sbin/bhyve)
 OPTIONS_DEFINE_amd64+=	BHYVE
@@ -57,6 +57,9 @@ NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
 
 NSS_CONFIGURE_WITH=	nss-plugin
 
+READLINE_CONFIGURE_WITH=	readline
+READLINE_USES=		readline
+
 SASL_CONFIGURE_WITH=	sasl
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
@@ -70,6 +73,7 @@ USE_RC_SUBR=	libvirtd virtlogd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--without-avahi \
+		--without-dbus \
 		--without-polkit \
 		--without-hal \
 		--without-udev \
diff --git a/devel/libvirt/distinfo b/devel/libvirt/distinfo
index 980a161b24c2..d1dfcb8a254c 100644
--- a/devel/libvirt/distinfo
+++ b/devel/libvirt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475687370
-SHA256 (libvirt-2.3.0.tar.xz) = e430e69b27d3f6c97255e638617b59b179618d531d81ac7dfe0783a1c1eeafd1
-SIZE (libvirt-2.3.0.tar.xz) = 13224384
+TIMESTAMP = 1478323826
+SHA256 (libvirt-2.4.0.tar.xz) = b727c5f43ed3d7337ec2c2f2031ebd4207507978f68d00ad13d4f0f84aad6224
+SIZE (libvirt-2.4.0.tar.xz) = 13237652