diff --git a/editors/mg/Makefile b/editors/mg/Makefile
index eb6a19211330..a2d846277840 100644
--- a/editors/mg/Makefile
+++ b/editors/mg/Makefile
@@ -1,41 +1,40 @@
 PORTNAME=	mg
-DISTVERSION=	20231016
-PORTREVISION=	1
+DISTVERSION=	20240405
 PORTEPOCH=	1
 CATEGORIES=	editors
 MASTER_SITES=   https://hydrus.org.uk/downloads/
 
 MAINTAINER=	cdr.nil@gmail.com
 COMMENT=	Small, fast Emacs-like editor
 WWW=		https://man.openbsd.org/mg
 
 LICENSE=	PD
 
 USES=		ncurses uidfix
 MAKE_ARGS+=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/share/man/man \
 		NCURSESLIB=${NCURSESLIB} NCURSESINC=${NCURSESINC}
 FLAVORS=	dynamic static
 FLAVOR?=	${FLAVORS:[1]}
 static_PKGNAMESUFFIX=	-static
 .if ${FLAVOR} == static
 COMMENT+=	(rescue(8) version)
 MAKE_ARGS+= 	NO_SHARED=yes
 PLIST_FILES=	/rescue/mg
 .else
 PLIST_FILES=	bin/mg \
 		share/man/man1/mg.1.gz
 PORTDOCS=	README tutorial
 OPTIONS_DEFINE=	DOCS
 .endif
 
 .if ${FLAVOR} == static
 do-install:
 	@${MKDIR} ${STAGEDIR}/rescue
 	${INSTALL_PROGRAM} ${WRKSRC}/mg ${STAGEDIR}/rescue
 .else
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/editors/mg/distinfo b/editors/mg/distinfo
index 1ba3033376f9..9bfb9834cce3 100644
--- a/editors/mg/distinfo
+++ b/editors/mg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698048672
-SHA256 (mg-20231016.tar.gz) = ef16fb32aae1dc132d4250039eb0a057826c7e888beb39bdf4748c0a4b0179e9
-SIZE (mg-20231016.tar.gz) = 154296
+TIMESTAMP = 1712395301
+SHA256 (mg-20240405.tar.gz) = abda55c6c53e8316324d56a9851865ada13f9cd82295f3757de7cb4b83bead57
+SIZE (mg-20240405.tar.gz) = 156768
diff --git a/editors/mg/files/patch-main.c b/editors/mg/files/patch-main.c
index ec956ee56e0c..f712ba61ff81 100644
--- a/editors/mg/files/patch-main.c
+++ b/editors/mg/files/patch-main.c
@@ -1,47 +1,33 @@
---- main.c.orig	2023-10-20 07:56:18 UTC
+--- main.c.orig	2023-10-24 10:26:02 UTC
 +++ main.c
 @@ -16,7 +16,7 @@
  #include <string.h>
  #include <termios.h>
  #include <unistd.h>
 -#include <util.h>
 +#include <libutil.h>
  
  #include "def.h"
  #include "kbd.h"
-@@ -43,6 +43,10 @@ struct mgwin	*wheadp;			/* MGWIN listhead	*/
+@@ -43,6 +43,10 @@ char		 pat[NPAT];			/* pattern		*/
  struct vhead	 varhead;			/* Variable list head	*/
  char		 pat[NPAT];			/* pattern		*/
  
 +#ifndef __dead
 +#define __dead __attribute__ ((__noreturn__))
 +#endif
 +
  static void	 edinit(struct buffer *);
  static void	 pty_init(void);
  static __dead void usage(void);
-@@ -71,10 +75,6 @@ main(int argc, char **argv)
+@@ -70,10 +74,6 @@ main(int argc, char **argv)
+ 	int	 	 o, i, nfiles;
  	int	  	 nobackups = 0;
  	struct buffer	*bp = NULL;
- 
+-
 -	if (pledge("stdio rpath wpath cpath fattr chown getpw tty proc exec",
 -	    NULL) == -1)
 -		err(1, "pledge");
--
+ 
  	while ((o = getopt(argc, argv, "nRb:f:u:")) != -1)
  		switch (o) {
- 		case 'b':
-@@ -167,9 +167,11 @@ main(int argc, char **argv)
- 		ffclose(ffp, NULL);
- 	}
- 
--	if (batch)
-+	if (batch) {
-+		vttidy();
- 		return (0);
--
-+	}
-+	
- 	/*
- 	 * Now ensure any default buffer modes from the startup file are
- 	 * given to any files opened when parsing the startup file.
diff --git a/editors/mg/files/patch-re_search.c b/editors/mg/files/patch-re_search.c
new file mode 100644
index 000000000000..a37c830b014a
--- /dev/null
+++ b/editors/mg/files/patch-re_search.c
@@ -0,0 +1,15 @@
+--- re_search.c.orig	2024-04-06 09:29:51 UTC
++++ re_search.c
+@@ -342,10 +342,9 @@ re_forwsrch(void)
+ 	if (tbo == clp->l_used)
+ 		/*
+ 		 * Don't start matching past end of line -- must move to
+-		 * beginning of next line, unless line is empty or at
+-		 * end of file.
++		 * beginning of next line, unless at end of file.
+ 		 */
+-		if (clp != curbp->b_headp && llength(clp) != 0) {
++		if (clp != curbp->b_headp) {
+ 			clp = lforw(clp);
+ 			tdotline++;
+ 			tbo = 0;