Index: Mk/Uses/emacs.mk
===================================================================
--- Mk/Uses/emacs.mk
+++ Mk/Uses/emacs.mk
@@ -106,7 +106,7 @@
 EMACS_VER=			27.0.50
 EMACS_PORTDIR=		editors/emacs-devel
 .else
-EMACS_VER=			26.1
+EMACS_VER=		26.1.92
 EMACS_PORTDIR=		editors/emacs
 .endif
 
Index: editors/emacs/Makefile
===================================================================
--- editors/emacs/Makefile
+++ editors/emacs/Makefile
@@ -3,10 +3,9 @@
 
 PORTNAME=	emacs
 DISTVERSION=	${EMACS_VER}
-PORTREVISION=	6
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
-MASTER_SITES=	GNU
+MASTER_SITES=	GNU_ALPHA/emacs/pretest
 
 .if ${FLAVOR:U} == canna
 PATCH_DIST_STRIP=	-p1
@@ -43,7 +42,7 @@
 
 CONFIGURE_ARGS=	--disable-build-details \
 		--localstatedir=/var \
-		--with-gameuser=games:games
+		--without-gpm
 .if ${FLAVOR:U} == canna
 CONFIGURE_ARGS+=	--with-canna
 .endif
@@ -213,7 +212,7 @@
 			libsoup-2.4.so:devel/libsoup
 XWIDGETS_IMPLIES=	GTK3
 
-EMACS_VER=		26.1
+EMACS_VER=		26.1.92
 
 .include <bsd.port.options.mk>
 
Index: editors/emacs/distinfo
===================================================================
--- editors/emacs/distinfo
+++ editors/emacs/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1527559243
-SHA256 (emacs-26.1.tar.xz) = 1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c
-SIZE (emacs-26.1.tar.xz) = 44258932
+TIMESTAMP = 1551972051
+SHA256 (emacs-26.1.92.tar.xz) = 0aa1dfa39b020feb49b82a388863c8a4b2ee0f1dfc04528f49759dbba4f28d41
+SIZE (emacs-26.1.92.tar.xz) = 44387596
 SHA256 (emacs26.1-canna-20180529.diff.gz) = defe94426449a5d48c1b0b92c0a6051816b78dba25c600d38c06ab903d667ecb
 SIZE (emacs26.1-canna-20180529.diff.gz) = 30163
Index: editors/emacs/files/patch-lisp_textmodes_ispell.el
===================================================================
--- editors/emacs/files/patch-lisp_textmodes_ispell.el
+++ /dev/null
@@ -1,16 +0,0 @@
---- lisp/textmodes/ispell.el.orig	2018-05-25 08:53:30 UTC
-+++ lisp/textmodes/ispell.el
-@@ -1111,7 +1111,12 @@ dictionary from that list was found."
- 				 null-device
- 				 t
- 				 nil
--				 "-D")
-+                                 ;; Hunspell 1.7.0 (and later?) won't
-+                                 ;; show LOADED DICTIONARY unless
-+                                 ;; there's at least one file argument
-+                                 ;; on the command line.  So we feed
-+                                 ;; it with the null device.
-+				 "-D" null-device)
- 	    (buffer-string))
- 	  "[\n\r]+"
- 	  t))
Index: editors/emacs/pkg-plist
===================================================================
--- editors/emacs/pkg-plist
+++ editors/emacs/pkg-plist
@@ -4,18 +4,18 @@
 bin/emacs-%%EMACS_VER%%
 bin/emacsclient
 bin/etags
+include/emacs-module.h
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/hexl
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/profile
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/rcs2log
-@(games,games,4555) libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/update-game-score
 man/man1/ctags.1.gz
 man/man1/ebrowse.1.gz
 man/man1/emacs.1.gz
 man/man1/emacsclient.1.gz
 man/man1/etags.1.gz
-share/appdata/emacs.appdata.xml
 share/applications/emacs.desktop
+share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%-buffer.gdb
 %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.desktop
@@ -4122,6 +4122,3 @@
 share/icons/hicolor/scalable/apps/emacs.svg
 share/icons/hicolor/scalable/mimetypes/emacs-document.svg
 share/icons/hicolor/scalable/mimetypes/emacs-document23.svg
-@(games,games,0664) /var/games/emacs/snake-scores
-@(games,games,0664) /var/games/emacs/tetris-scores
-@dir(games,games,0755) /var/games/emacs