Index: Mk/Uses/emacs.mk
===================================================================
--- Mk/Uses/emacs.mk
+++ Mk/Uses/emacs.mk
@@ -106,7 +106,7 @@
 EMACS_VER=			28.0.50
 EMACS_PORTDIR=		editors/emacs-devel
 .else
-EMACS_VER=		27.1
+EMACS_VER=		27.1.91
 EMACS_PORTDIR=		editors/emacs
 .endif
 
Index: editors/emacs/Makefile
===================================================================
--- editors/emacs/Makefile
+++ editors/emacs/Makefile
@@ -2,14 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	emacs
-DISTVERSION=	27.1
-PORTREVISION=	4
+DISTVERSION=	27.1.91
 PORTEPOCH=	3
 CATEGORIES=	editors
-MASTER_SITES=	GNU
-
-PATCH_SITES=	https://github.com/emacs-mirror/emacs/commit/:upstream
-PATCHFILES=	43a1b79f56cb1ac6530e8b41f3c329890a00a8f6.patch:-p1:upstream
+#MASTER_SITES=	GNU
+MASTER_SITES=	GNU_ALPHA/emacs/pretest
 
 .if ${FLAVOR:U} == canna
 PATCH_SITES+=		https://www.gentei.org/~yuuji/software/emacs27canna/:canna
Index: editors/emacs/distinfo
===================================================================
--- editors/emacs/distinfo
+++ editors/emacs/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1604331394
-SHA256 (emacs-27.1.tar.xz) = 4a4c128f915fc937d61edfc273c98106711b540c9be3cd5d2e2b9b5b2f172e41
-SIZE (emacs-27.1.tar.xz) = 43752012
+TIMESTAMP = 1611939597
+SHA256 (emacs-27.1.91.tar.xz) = c69a6c66a21e8a56d4e1f90a2372d428683118f91b1577e50cc0a10adee39abd
+SIZE (emacs-27.1.91.tar.xz) = 44608052
 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
Index: editors/emacs/files/patch-lisp_net_tramp-sh.el
===================================================================
--- editors/emacs/files/patch-lisp_net_tramp-sh.el
+++ /dev/null
@@ -1,19 +0,0 @@
---- lisp/net/tramp-sh.el.orig	2019-07-25 19:41:28 UTC
-+++ lisp/net/tramp-sh.el
-@@ -4059,6 +4059,7 @@ process to set up.  VEC specifies the connection."
- 
-     ;; Disable echo expansion.
-     (tramp-message vec 5 "Setting up remote shell environment")
-+    (tramp-send-command vec "set +o vi +o emacs" t)
-     (tramp-send-command
-      vec "stty -inlcr -onlcr -echo kill '^U' erase '^H'" t)
-     ;; Check whether the echo has really been disabled.  Some
-@@ -4127,8 +4128,6 @@ process to set up.  VEC specifies the connection."
- 	(set-process-coding-system proc cs-decode cs-encode)
- 	(tramp-message
- 	 vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode)))
--
--    (tramp-send-command vec "set +o vi +o emacs" t)
- 
-     ;; Check whether the remote host suffers from buggy
-     ;; `send-process-string'.  This is known for FreeBSD (see comment
Index: editors/emacs/pkg-plist
===================================================================
--- editors/emacs/pkg-plist
+++ editors/emacs/pkg-plist
@@ -899,6 +899,7 @@
 %%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.th
 %%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.translators
 %%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.zh
+%%DATADIR%%/%%EMACS_VER%%/etc/w32-feature.el
 %%DATADIR%%/%%EMACS_VER%%/etc/yow.lines
 %%DATADIR%%/%%EMACS_VER%%/lisp/COPYING
 %%DATADIR%%/%%EMACS_VER%%/lisp/README
@@ -3190,6 +3191,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-plot.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-protocol.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-protocol.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-refile.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-refile.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-src.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-src.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-table.el.gz