diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 3c8a260f5ceb..26cf7c8930b8 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -16,7 +16,7 @@
 # MAILDROP_MBOX_DIR=<dir>	Specify DEFAULT mailbox location
 
 PORTNAME=	maildrop
-PORTVERSION=	2.8.4
+PORTVERSION=	2.8.5
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
@@ -25,7 +25,7 @@ COMMENT=	Mail delivery agent (MDA) with filtering abilities
 
 LICENSE=	GPLv3
 
-USES=		iconv perl5 tar:bzip2
+USES=		iconv localbase:ldflags perl5 tar:bzip2
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-syslog=1 \
@@ -33,12 +33,10 @@ CONFIGURE_ARGS=	--enable-syslog=1 \
 		--with-etcdir="${PREFIX}/etc" \
 		--enable-maildirquota
 INSTALL_TARGET=	install-strip
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFLICTS=	courier-0.65* libunicode-[0-9]*
 
-LIB_DEPENDS+=	libpcre.so:devel/pcre \
+LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libcourier-unicode.so:devel/courier-unicode
 
 MAILDROP_LOG_COLUMNS?=	72	# lenght of 'File:' line in log
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 776afbca52ed..065e3f05a5ef 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471213699
-SHA256 (maildrop-2.8.4.tar.bz2) = 440eb0d1507aa09d7bd179dc5937bf02d0fa23397ffa0d00686c41d9b7bbcae8
-SIZE (maildrop-2.8.4.tar.bz2) = 2073383
+TIMESTAMP = 1484728651
+SHA256 (maildrop-2.8.5.tar.bz2) = c21174ef882aeb169031bb5886b55959687074415153232f4c60695405fcddb1
+SIZE (maildrop-2.8.5.tar.bz2) = 2072987