diff --git a/mail/py-alot/Makefile b/mail/py-alot/Makefile
index fdc1a6c9b9ee..451d1af0470f 100644
--- a/mail/py-alot/Makefile
+++ b/mail/py-alot/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	alot
-DISTVERSION=	0.7
+DISTVERSION=	0.8.1
 CATEGORIES=	mail python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	GITHUB
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	mail@dbalan.in
@@ -12,15 +12,18 @@ COMMENT=	Terminal MUA using Notmuch mail
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notmuch>=0.13:mail/py-notmuch@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notmuch>=0.27:mail/py-notmuch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gpgme>0:security/py-gpgme@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>4.7.0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-magic>0:devel/py-python-magic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}twisted>10.2.0:devel/py-twisted@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urwidtrees>1.0:devel/py-urwidtrees@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}service_identity>0:security/py-service_identity@${PY_FLAVOR}
+
+USES=		python:3.6+
+USE_GITHUB=	yes
+GH_ACCOUNT=	pazz
 
-USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
diff --git a/mail/py-alot/distinfo b/mail/py-alot/distinfo
index c069f1053516..ef216ce2bbd1 100644
--- a/mail/py-alot/distinfo
+++ b/mail/py-alot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519488610
-SHA256 (alot-0.7.tar.gz) = ac816562ae869cad30fc04f9adf684efdf14f9abb5ee967531c9221a38406617
-SIZE (alot-0.7.tar.gz) = 127317
+TIMESTAMP = 1569153134
+SHA256 (pazz-alot-0.8.1_GH0.tar.gz) = 823e2fae014c1036609068c6109042b676113a382eacbd04eb3dfa461ef53953
+SIZE (pazz-alot-0.8.1_GH0.tar.gz) = 220342