diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 828e9120c75f..62c2e6ee14b2 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	emacs
-DISTVERSION=	28.0.50.20200514
+DISTVERSION=	28.0.50.20200518
 PORTEPOCH=	2
 CATEGORIES=	editors
 PKGNAMESUFFIX=	-devel
@@ -28,7 +28,7 @@ USES=		autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
 CPE_VENDOR=	gnu
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	a467173
+GH_TAGNAME=	b1fe27d
 
 .if ${FLAVOR:U} != nox
 USES+=		desktop-file-utils gnome xorg
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index bd80f707e655..7e2b67ff9a5c 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1589439699
-SHA256 (emacs-mirror-emacs-28.0.50.20200514-a467173_GH0.tar.gz) = d5ec7bfa204a515de03118b77c6cb67eb55953913aa5b0d5dc8fd43a3b0cf14e
-SIZE (emacs-mirror-emacs-28.0.50.20200514-a467173_GH0.tar.gz) = 41912455
+TIMESTAMP = 1589809202
+SHA256 (emacs-mirror-emacs-28.0.50.20200518-b1fe27d_GH0.tar.gz) = 749914f01ee70f6b88451bcfdd5c50bec74f0e7062db3e1453030bb864962d52
+SIZE (emacs-mirror-emacs-28.0.50.20200518-b1fe27d_GH0.tar.gz) = 41900421
diff --git a/editors/emacs-devel/files/patch-lib-src_etags.c b/editors/emacs-devel/files/patch-lib-src_etags.c
new file mode 100644
index 000000000000..e6bc526020d1
--- /dev/null
+++ b/editors/emacs-devel/files/patch-lib-src_etags.c
@@ -0,0 +1,10 @@
+--- lib-src/etags.c.orig	2020-05-18 16:17:29 UTC
++++ lib-src/etags.c
+@@ -4196,7 +4196,6 @@ C_entries (int c_ext, FILE *inf)
+ 	      objdef = omethodsign;
+ 	      break;
+ 	    }
+-	  FALLTHROUGH;
+ 	resetfvdef:
+ 	case '#': case '~': case '&': case '%': case '/':
+ 	case '|': case '^': case '!': case '.': case '?':
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 92d6fdc4ef65..dcf316e18c0c 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -2903,16 +2903,10 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/landmark.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ledit.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ledit.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/levents.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/levents.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lmenu.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lmenu.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/longlines.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/longlines.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lucid.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lucid.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mailpost.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mailpost.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mantemp.el.gz
@@ -2924,8 +2918,6 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mouse-sel.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-emacs-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-emacs-lock.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-whitespace.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-whitespace.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/otodo-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/otodo-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/patcomp.el.gz