diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
index 7fd283ab2481..d8ad8f8e4950 100644
--- a/mail/esmtp/Makefile
+++ b/mail/esmtp/Makefile
@@ -1,49 +1,50 @@
 PORTNAME=	esmtp
 PORTVERSION=	1.2
 PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Relay-only Mail Transfer Agent with sendmail compatible syntax
 WWW=		http://esmtp.sourceforge.net
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libesmtp.so:mail/libesmtp
 
-USES=		tar:bzip2 bison ssl
+USES=		bison pkgconfig ssl tar:bzip2
+
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	README
 PLIST_FILES=	bin/esmtp etc/esmtprc.sample man/man1/esmtp.1.gz \
 		man/man5/esmtprc.5.gz
 
 SUB_FILES=	pkg-message
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 .for file in ${PORTNAME}.1
 	@${REINPLACE_CMD} -e \
 		's|^/etc|${PREFIX}/etc|g' ${WRKSRC}/${file}
 .endfor
 .for file in esmtprc.5 sample.esmtprc
 	@${REINPLACE_CMD} -e \
 		's|/usr/bin/|${LOCALBASE}/bin/|g ; \
 		 s|/usr/lib/|/usr/libexec/|g' ${WRKSRC}/${file}
 .endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/esmtprc.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/sample.esmtprc \
 		${STAGEDIR}${PREFIX}/etc/esmtprc.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/esmtp/files/patch-configure b/mail/esmtp/files/patch-configure
new file mode 100644
index 000000000000..74c3a7a80c48
--- /dev/null
+++ b/mail/esmtp/files/patch-configure
@@ -0,0 +1,18 @@
+--- configure.orig	2009-12-24 08:19:09 UTC
++++ configure
+@@ -4343,12 +4343,12 @@ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libESMTP" >&5
+ $as_echo_n "checking for libESMTP... " >&6; }
+-if libesmtp-config --version > /dev/null 2>&1
++if pkgconf libesmtp-1.0 > /dev/null 2>&1
+ then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	CFLAGS="$CFLAGS `libesmtp-config --cflags`"
+-	LIBS="$LIBS `libesmtp-config --libs`"
++	CFLAGS="$CFLAGS `pkgconf libesmtp-1.0 --cflags`"
++	LIBS="$LIBS `pkgconf libesmtp-1.0 --libs`"
+ else
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }