diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile
index ab5330580023..e5bd8f53c054 100644
--- a/mail/gotmail/Makefile
+++ b/mail/gotmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gotmail
-PORTVERSION=	0.8.4
+PORTVERSION=	0.8.6
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,13 +19,7 @@ RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		${SITE_PERL}/Net/libnet.cfg:${PORTSDIR}/net/p5-Net
 
 MAN1=		${PORTNAME}.1
-NO_BUILD=	yes
 USE_PERL5=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-pre-patch:
-	${PERL} -pi -e 's|\r$$||' ${WRKSRC}/${PORTNAME}
-	${PERL} -pi -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/${PORTNAME}
 
 do-install:
 .for i in ${MAN1}
diff --git a/mail/gotmail/distinfo b/mail/gotmail/distinfo
index cc3ccb39f449..df67d14ff670 100644
--- a/mail/gotmail/distinfo
+++ b/mail/gotmail/distinfo
@@ -1,2 +1,2 @@
-MD5 (gotmail-0.8.4.tar.gz) = 52959c61c1c12a63b50ee1fdbea35d77
-SIZE (gotmail-0.8.4.tar.gz) = 36846
+MD5 (gotmail-0.8.6.tar.gz) = de959e6ce6c4d7a09d94a59b992d3b92
+SIZE (gotmail-0.8.6.tar.gz) = 35212