Index: editors/emacs/Makefile
===================================================================
--- editors/emacs/Makefile	(revision 553884)
+++ editors/emacs/Makefile	(working copy)
@@ -4,14 +4,16 @@
 PORTNAME=	emacs
 DISTVERSION=	27.1
 PORTEPOCH=	3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	GNU
 
+PATCH_SITES=	https://github.com/emacs-mirror/emacs/commit/:upstream
+PATCHFILES=	43a1b79f56cb1ac6530e8b41f3c329890a00a8f6.patch:-p1:upstream
+
 .if ${FLAVOR:U} == canna
-PATCH_SITES=		https://www.gentei.org/~yuuji/software/emacs27canna/
-PATCHFILES=		emacs27.0.90-canna-20200308.diff.gz
-PATCH_DIST_STRIP=	-p1
+PATCH_SITES+=		https://www.gentei.org/~yuuji/software/emacs27canna/:canna
+PATCHFILES+=		emacs27.0.90-canna-20200308.diff.gz:-p1:canna
 .endif
 
 MAINTAINER=	emacs@FreeBSD.org
Index: editors/emacs/distinfo
===================================================================
--- editors/emacs/distinfo	(revision 553884)
+++ editors/emacs/distinfo	(working copy)
@@ -1,5 +1,7 @@
-TIMESTAMP = 1597115258
+TIMESTAMP = 1604331394
 SHA256 (emacs-27.1.tar.xz) = 4a4c128f915fc937d61edfc273c98106711b540c9be3cd5d2e2b9b5b2f172e41
 SIZE (emacs-27.1.tar.xz) = 43752012
 SHA256 (emacs27.0.90-canna-20200308.diff.gz) = af22f2f671fdc0a21844e015b141bc2d6798dd8ffb63bb6928385acb0cea4ab5
 SIZE (emacs27.0.90-canna-20200308.diff.gz) = 30415
+SHA256 (43a1b79f56cb1ac6530e8b41f3c329890a00a8f6.patch) = e5d38c58e134d023ed8a75336205fae3b604cd8177fe9705b08a726cb6cf54c4
+SIZE (43a1b79f56cb1ac6530e8b41f3c329890a00a8f6.patch) = 3483