diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index 39ea57fffebf..72d752d5f046 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -1,43 +1,44 @@
 # New ports collection makefile for:   getmail
 # Date created:        06 May 2001
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	getmail
-PORTVERSION=	3.1.7
+PORTVERSION=	3.2.0
 CATEGORIES=	mail python
 MASTER_SITES=	http://www.qcc.ca/~charlesc/software/getmail-3.0/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old-versions
 
 MAINTAINER=	sergei@kolobov.com
 COMMENT=	POP3 mail retriever with reliable Maildir and command delivery
 
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
 NO_BUILD=	yes
 
 SCRIPTS=	getmail getmail_maildir getmail_mbox
 MAN1=		getmail.1
 DOCS=		CHANGELOG THANKS TODO docs.txt faq.txt getmail.txt \
 		docs.html faq.html
 
 post-patch:
 	@cd ${WRKSRC} && \
 		${REINPLACE_CMD} -e 's!/usr/lib/getmail!${DATADIR}!' \
-		-e 's!/usr/bin/python!${PYTHON_CMD}!' ${SCRIPTS}
+		-e 's!`which python`!${PYTHON_CMD}!' \
+		-e 's!/usr/bin/python!${PYTHON_CMD}!' ${SCRIPTS} *.py
 
 do-install:
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin
 	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
 	@${MKDIR} ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/*.py ${DATADIR}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/getmailrc-example ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/getmail/distinfo b/mail/getmail/distinfo
index 48c8c373fc36..a1cdcd85bcd0 100644
--- a/mail/getmail/distinfo
+++ b/mail/getmail/distinfo
@@ -1 +1 @@
-MD5 (getmail-3.1.7.tar.gz) = e5bffd36858ed4cdc98236b3b1f50594
+MD5 (getmail-3.2.0.tar.gz) = b64e66f2a44d4f2897b6c7b117aca836
diff --git a/mail/getmail/pkg-plist b/mail/getmail/pkg-plist
index b3f5091befdc..8eb968be40b7 100644
--- a/mail/getmail/pkg-plist
+++ b/mail/getmail/pkg-plist
@@ -1,23 +1,24 @@
+@comment $FreeBSD$
 bin/getmail
 bin/getmail_maildir
 bin/getmail_mbox
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/docs.html
 %%PORTDOCS%%%%DOCSDIR%%/docs.txt
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.txt
 %%PORTDOCS%%%%DOCSDIR%%/getmail.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%EXAMPLESDIR%%/getmailrc-example
 @dirrm %%EXAMPLESDIR%%
 %%DATADIR%%/ConfParser.py
 %%DATADIR%%/getmail.py
 %%DATADIR%%/getmail_classes.py
 %%DATADIR%%/getmail_constants.py
 %%DATADIR%%/getmail_defaults.py
 %%DATADIR%%/getmail_mbox.py
 %%DATADIR%%/getmail_utilities.py
 %%DATADIR%%/timeoutsocket.py
 @dirrm %%DATADIR%%