Index: head/mail/imapsync/Makefile
===================================================================
--- head/mail/imapsync/Makefile	(revision 395534)
+++ head/mail/imapsync/Makefile	(revision 395535)
@@ -1,39 +1,45 @@
 # Created by: Alex Deiter <tiamat@komi.mts.ru>
 # $FreeBSD$
 
 PORTNAME=	imapsync
-PORTVERSION=	1.607
+PORTVERSION=	1.644
+DISTVERSIONPREFIX=	v
 CATEGORIES=	mail perl5
-MASTER_SITES=	https://fedorahosted.org/released/${PORTNAME}/
+MASTER_SITES=	https://codeload.github.com/imapsync/imapsync/tar.gz/imapsync-${PORTVERSION}?dummy=/
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	IMAP synchronization, copy or migration tool
 
 RUN_DEPENDS=	p5-Mail-IMAPClient>0:${PORTSDIR}/mail/p5-Mail-IMAPClient \
 		p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey \
 		p5-IO-Tee>0:${PORTSDIR}/devel/p5-IO-Tee \
 		p5-IO-Socket-SSL>0:${PORTSDIR}/security/p5-IO-Socket-SSL \
 		p5-Unicode-String>0:${PORTSDIR}/converters/p5-Unicode-String \
 		p5-File-Copy-Recursive>0:${PORTSDIR}/devel/p5-File-Copy-Recursive
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}
+
 USES=		cpe perl5 tar:tgz
+USE_GITHUB=	yes
+GH_ACCOUNT=	imapsync
+
 CPE_VENDOR=	gilles_lamiral
 NO_BUILD=	yes
 
 PORTSCOUT=	limit:^1\.(\d\.){3}
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
 POD2MAN?=	pod2man
 
 do-patch:
 	${REINPLACE_CMD} \
 		-e 's|/usr/bin/perl|${PERL}|g' \
 		${WRKSRC}/${PORTNAME}
 
 do-install:
 	${POD2MAN} ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.1
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
Index: head/mail/imapsync/distinfo
===================================================================
--- head/mail/imapsync/distinfo	(revision 395534)
+++ head/mail/imapsync/distinfo	(revision 395535)
@@ -1,2 +1,2 @@
-SHA256 (imapsync-1.607.tgz) = 784331cfa6cc391751dcdc5290eba5d50bf3ddbe9b213f072b413941a3fe4f2a
-SIZE (imapsync-1.607.tgz) = 973467
+SHA256 (imapsync-imapsync-v1.644_GH0.tgz) = cdca8c91eba7e6b771d52e9092521c523ee5042ce669c6e126f3c2171029a74a
+SIZE (imapsync-imapsync-v1.644_GH0.tgz) = 946984