diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index aa6127d31f1d..cbe08ef503af 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,97 +1,97 @@
 # 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, Tk, X11, etc..
 # The fetchmail program itself does not need Python, but if you
 # want fetchmailconf to work, define WITH_X11
 
 PORTNAME=	fetchmail
-PORTVERSION=	6.1.2
+PORTVERSION=	6.2.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.tuxedo.org/~esr/fetchmail/ \
 		ftp://ftp.ccil.org/pub/esr/fetchmail/
 
 MAINTAINER=	ve@sci.fi
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 .if defined(WITH_X11)
 RUN_DEPENDS=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 .endif
 
 .if defined(WITH_X11)
 USE_PYTHON=	yes
 .endif
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-POP2 --enable-SDPS \
 		--enable-nls --with-hesiod=no --enable-fallback=no
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
 		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 MAKE_ENV+=	${CONFIGURE_ENV}
 MAN1=		fetchmail.1
 MLINKS=		fetchmail.1 fetchmailconf.1
 
 FDOC=		${PREFIX}/share/doc/fetchmail
 DOCS=		COPYING FAQ FEATURES NEWS NOTES README \
 		design-notes.html fetchmail-FAQ.html fetchmail-features.html
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 400014
 CONFIGURE_ARGS+=--enable-inet6
 .endif
 
 .if exists(/usr/lib/libssl.a) && exists(/usr/lib/libcrypto.a)
 CONFIGURE_ARGS+=--with-ssl=/usr
 DOCS+=		README.SSL
 PLIST_SUB+=	SSLDOCS="%%PORTDOCS%%"
 .elif exists(${LOCALBASE}/lib/libssl.a) && exists(${LOCALBASE}/lib/libcrypto.a)
 CONFIGURE_ARGS+=-with-includes=${LOCALBASE}/include/openssl --with-ssl=${LOCALBASE}
 CONFIGURE_ENV+=	RSAGLUE=-lRSAglue
 DOCS+=		README.SSL
 PLIST_SUB+=	SSLDOCS="%%PORTDOCS%%"
 .else
 PLIST_SUB+=	SSLDOCS="%%PORTDOCS%%@comment "
 .endif
 
 .if exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
 CONFIGURE_ARGS += --with-kerberos=/usr
 .endif
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a)
 CONFIGURE_ARGS += --with-kerberos5=${KRB5_HOME}
 .endif
 
 .if defined(WITH_NTLM)
 CONFIGURE_ARGS += --enable-NTLM
 DOCS+=		README.NTLM
 PLIST_SUB+=	NTLMDOCS="%%PORTDOCS%%"
 .else
 PLIST_SUB+=	NTLMDOCS="%%PORTDOCS%%@comment "
 .endif
 
 pre-patch:
 	@${CP} -f  /usr/include/md5.h ${WRKSRC}
 	@${SED} -e "s,^#!/.*/python,#!${PREFIX}/bin/python,g" \
 		${WRKSRC}/fetchmailconf > ${WRKDIR}/fetchmailconf.temp
 	@${MV} -f ${WRKDIR}/fetchmailconf.temp ${WRKSRC}/fetchmailconf
 	@${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		${FILESDIR}/fetchmailconf > ${WRKDIR}/fetchmailconf
 	@${REINPLACE_CMD} -e "s,@l@,,;s,@GT_NO@,," \
 		${WRKSRC}/intl/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${FDOC}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${FDOC}
 .endif
 	${MV} ${PREFIX}/bin/fetchmailconf ${PREFIX}/libexec/fetchmailconf.bin
 	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index 2a7134e46314..fd2377a055fe 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1 +1 @@
-MD5 (fetchmail-6.1.2.tar.gz) = 6c617efe83262f0e9d5c0992caab8f72
+MD5 (fetchmail-6.2.0.tar.gz) = 1242753944ad242bb4312af6be08b810
diff --git a/mail/fetchmail/pkg-plist b/mail/fetchmail/pkg-plist
index 3b8f397758b5..24b42dbdf9f5 100644
--- a/mail/fetchmail/pkg-plist
+++ b/mail/fetchmail/pkg-plist
@@ -1,27 +1,28 @@
 @comment $FreeBSD$
 bin/fetchmail
 bin/fetchmailconf
 libexec/fetchmailconf.bin
 %%PORTDOCS%%share/doc/fetchmail/COPYING
 %%PORTDOCS%%share/doc/fetchmail/FAQ
 %%PORTDOCS%%share/doc/fetchmail/FEATURES
 %%PORTDOCS%%share/doc/fetchmail/NEWS
 %%PORTDOCS%%share/doc/fetchmail/NOTES
 %%PORTDOCS%%share/doc/fetchmail/README
 %%NTLMDOCS%%share/doc/fetchmail/README.NTLM
 %%SSLDOCS%%share/doc/fetchmail/README.SSL
 %%PORTDOCS%%share/doc/fetchmail/design-notes.html
 %%PORTDOCS%%share/doc/fetchmail/fetchmail-FAQ.html
 %%PORTDOCS%%share/doc/fetchmail/fetchmail-features.html
 %%PORTDOCS%%@dirrm share/doc/fetchmail
 share/locale/ca/LC_MESSAGES/fetchmail.mo
 share/locale/cs/LC_MESSAGES/fetchmail.mo
 share/locale/da/LC_MESSAGES/fetchmail.mo
 share/locale/de/LC_MESSAGES/fetchmail.mo
 share/locale/es/LC_MESSAGES/fetchmail.mo
 share/locale/fr/LC_MESSAGES/fetchmail.mo
 share/locale/gl/LC_MESSAGES/fetchmail.mo
 share/locale/ja/LC_MESSAGES/fetchmail.mo
 share/locale/pl/LC_MESSAGES/fetchmail.mo
 share/locale/pt_BR/LC_MESSAGES/fetchmail.mo
+share/locale/sk/LC_MESSAGES/fetchmail.mo
 share/locale/tr/LC_MESSAGES/fetchmail.mo