diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile
index 41277cd1ae68..d431cc765cef 100644
--- a/sysutils/nut-devel/Makefile
+++ b/sysutils/nut-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nut
 PORTVERSION=	${NUT_COMMIT_DATE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
 # MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
@@ -69,6 +69,9 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--with-group=${NUT_GROUP} \
 		--with-dev
 
+CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+LIB_DEPENDS+=	libltdl.so:devel/libltdl
+
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 
 .if ${PORT_OPTIONS:MCGI}
diff --git a/sysutils/nut-devel/pkg-plist b/sysutils/nut-devel/pkg-plist
index c20f86209e65..2e93f9586d30 100644
--- a/sysutils/nut-devel/pkg-plist
+++ b/sysutils/nut-devel/pkg-plist
@@ -20,6 +20,7 @@
 @sample %%EXAMPLESDIR%%/newsyslog.sample etc/newsyslog.conf.d/nut.conf
 @sample %%EXAMPLESDIR%%/syslog.sample etc/syslog.d/nut
 %%NUT_USB%%etc/devd/nut-usb.conf
+bin/nut-scanner
 bin/upsc
 bin/upscmd
 bin/upslog
@@ -47,6 +48,10 @@ lib/libnutclientstub.a
 lib/libnutclientstub.so
 lib/libnutclientstub.so.1
 lib/libnutclientstub.so.1.0.0
+lib/libnutscan.a
+lib/libnutscan.so
+lib/libnutscan.so.1
+lib/libnutscan.so.1.0.0
 libdata/pkgconfig/libnutclient.pc
 libdata/pkgconfig/libnutscan.pc
 libdata/pkgconfig/libupsclient.pc
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 73868507ed9c..bb9792c23ae7 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nut
 PORTVERSION=	2.7.4
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -62,6 +62,9 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--with-group=${NUT_GROUP} \
 		--with-dev
 
+CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+LIB_DEPENDS+=	libltdl.so:devel/libltdl
+
 .if ${PORT_OPTIONS:MCGI}
 LIB_DEPENDS+=	libgd.so:graphics/gd
 CGIDIR?=	${PREFIX}/www/cgi-bin/${PORTNAME}
diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist
index 2fd0ddea5389..c29388ae986c 100644
--- a/sysutils/nut/pkg-plist
+++ b/sysutils/nut/pkg-plist
@@ -20,6 +20,7 @@
 @sample %%EXAMPLESDIR%%/newsyslog.sample etc/newsyslog.conf.d/nut.conf
 @sample %%EXAMPLESDIR%%/syslog.sample etc/syslog.d/nut
 %%NUT_USB%%etc/devd/nut-usb.conf
+bin/nut-scanner
 bin/upsc
 bin/upscmd
 bin/upslog
@@ -37,6 +38,10 @@ lib/libnutclient.a
 lib/libnutclient.so
 lib/libnutclient.so.0
 lib/libnutclient.so.0.0.0
+lib/libnutscan.a
+lib/libnutscan.so
+lib/libnutscan.so.1
+lib/libnutscan.so.1.0.0
 lib/libupsclient.a
 lib/libupsclient.so
 lib/libupsclient.so.4