diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 34b0eec60ce6..8b2635af0b0d 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,59 +1,63 @@
 # New ports collection makefile for:	fetchmail
 # Date created:		25 Feb 2000
 # Whom:			Ville Eerola <ve@sci.fi>
 #
 # $FreeBSD$
 #
 # NOTE:  The fetchmailconf program (an interactive program for
 # writing .fetchmailrc files) requires Python, found in the Ports
 # Collection under lang/python.  The fetchmail program itself
 # does not need Python, so there is no RUN_DEPENDS for Python in
 # this Makefile.
 
 PORTNAME=	fetchmail
 PORTVERSION= 	5.3.8
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/
 
 MAINTAINER=	ve@sci.fi
 
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --enable-OPIE --enable-RPA --enable-POP2 --enable-SDPS
-CONFIGURE_ENV=  LDFLAGS="${CFLAGS}"
+CONFIGURE_ARGS= --enable-OPIE --enable-RPA --enable-POP2 --enable-SDPS \
+		--enable-nls
+CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 MAN1=		fetchmail.1
 MLINKS=		fetchmail.1 fetchmailconf.1
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 400014
 CONFIGURE_ARGS+=--enable-inet6
 .if exists(/usr/lib/libssl.a) && exists(/usr/lib/libcrypto.a)
 CONFIGURE_ARGS+=--with-ssl=/usr
 .endif
 .endif
 
 .if exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
 CONFIGURE_ARGS += --with-kerberos=/usr/include
 .endif
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a)
 CONFIGURE_ARGS += --with-kerberos5=${KRB5_HOME}
 .endif
 
 FDOC=   ${PREFIX}/share/doc/fetchmail
 
 pre-patch:
 	@${CP} -f  /usr/include/md5.h ${WRKSRC}
 	@perl -pi.bak -e 's|^#!/.*/python|#!${PREFIX}/bin/python|;' ${WRKSRC}/fetchmailconf
 	@${SED} -e "s|@PREFIX@|${PREFIX}|" ${FILESDIR}/fetchmailconf > ${WRKDIR}/fetchmailconf
 
 post-install:
 	${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${FDOC}
 	cd ${WRKSRC} && ${INSTALL_DATA} \
 	   sample.rcfile FAQ NOTES FEATURES README COPYING \
 	   fetchmail-FAQ.html fetchmail-features.html \
 	   design-notes.html ${FDOC}
 	${MV} ${PREFIX}/bin/fetchmailconf ${PREFIX}/libexec/fetchmailconf.bin
 	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/mail/fetchmail/files/patch-al b/mail/fetchmail/files/patch-al
new file mode 100644
index 000000000000..2e891603d8b2
--- /dev/null
+++ b/mail/fetchmail/files/patch-al
@@ -0,0 +1,13 @@
+--- po/Makefile.in.in~	Mon Nov 23 06:42:00 1998
++++ po/Makefile.in.in	Sun May 21 23:17:50 2000
+@@ -19,8 +19,8 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
+-gnulocaledir = $(prefix)/share/locale
++localedir = $(prefix)/share/locale
++gnulocaledir = ${localedir}
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
+ 
diff --git a/mail/fetchmail/files/patch-am b/mail/fetchmail/files/patch-am
new file mode 100644
index 000000000000..8ee5f0d463b3
--- /dev/null
+++ b/mail/fetchmail/files/patch-am
@@ -0,0 +1,11 @@
+--- configure~	Sat May 27 12:41:32 2000
++++ configure	Sat May 27 12:45:12 2000
+@@ -5010,7 +5010,7 @@
+ if test "$USE_NLS" = "yes"
+ then
+ 	echo 'Enabling internationalization support...'
+-	POMAKE='$(MAKE) -C po'
++	POMAKE='cd po ; $(MAKE)'
+   	if test "x$prefix" != xNONE; then
+ 		EXTRADEFS="$EXTRADEFS -DLOCALEDIR='\"$prefix/share/locale\"'"
+   	else
diff --git a/mail/fetchmail/pkg-plist b/mail/fetchmail/pkg-plist
index a0624bed77ba..766837d90f79 100644
--- a/mail/fetchmail/pkg-plist
+++ b/mail/fetchmail/pkg-plist
@@ -1,13 +1,22 @@
 bin/fetchmail
 bin/fetchmailconf
 libexec/fetchmailconf.bin
+share/locale/es/LC_MESSAGES/fetchmail.mo
+share/locale/fr/LC_MESSAGES/fetchmail.mo
+share/locale/pl/LC_MESSAGES/fetchmail.mo
+share/locale/pt_BR/LC_MESSAGES/fetchmail.mo
+share/locale/cs/LC_MESSAGES/fetchmail.mo
+share/locale/gl/LC_MESSAGES/fetchmail.mo
 share/doc/fetchmail/COPYING
 share/doc/fetchmail/FAQ
 share/doc/fetchmail/FEATURES
 share/doc/fetchmail/NOTES
 share/doc/fetchmail/README
 share/doc/fetchmail/design-notes.html
 share/doc/fetchmail/fetchmail-FAQ.html
 share/doc/fetchmail/fetchmail-features.html
 share/doc/fetchmail/sample.rcfile
 @dirrm share/doc/fetchmail
+@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/* 2>/dev/null || true
+@unexec rmdir %D/share/locale 2>/dev/null || true