diff --git a/games/nehquake/Makefile b/games/nehquake/Makefile
index e6581237db65..e4b1aa120525 100644
--- a/games/nehquake/Makefile
+++ b/games/nehquake/Makefile
@@ -1,57 +1,62 @@
 PORTNAME=	nehquake
 PORTVERSION=	1.0
 PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	LOCAL/alepulver
 DISTNAME=	NehQuake-bjp-bin-src.linux
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quake engine designed for playing Nehahra
-WWW=		http://planetquake.com/nehahra/
+WWW=		https://quakewiki.org/wiki/Nehahra \
+		https://www.quaddicted.com/reviews/nehahra.html
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: sb_lines
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: sb_lines
-DEPRECATED= Fails to build, abandoned upstream and marked broken over a year go
-EXPIRATION_DATE=2023-11-30
+LICENSE=	GPLv2+
 
-USES=		gl gmake dos2unix tar:bzip2 xorg
+USES=		gl gmake tar:bzip2 xorg
 USE_GL=		gl
-USE_XORG=	xxf86dga xxf86vm
+USE_XORG=	x11 xext xxf86dga xxf86vm
 
 OPTIONS_DEFINE=		OPTIMIZED_CFLAGS SDL
 OPTIONS_DEFINE_amd64=	X86_ASM
 OPTIONS_DEFINE_i386=	X86_ASM
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS SDL
 OPTIONS_DEFAULT_amd64=	X86_ASM
 OPTIONS_DEFAULT_i386=	X86_ASM
 OPTIONS_SUB=	yes
 
 SDL_USES=	sdl
 SDL_USE=	SDL=sdl
 SDL_MAKE_ENV=	BUILD_SDL=YES
 
 X86_ASM_DESC=	Enable x86 assembly code
 
 ALL_TARGET=	release
 SUB_FILES=	pkg-message
 
 .include "${.CURDIR}/../quake-data/Makefile.include"
-
 .include <bsd.port.options.mk>
 
 .for f in OPTIMIZED_CFLAGS X86_ASM
 .   if ${PORT_OPTIONS:M${f}}
 MAKE_ENV+=	USE_${f}=YES
 .   else
 MAKE_ENV+=	USE_${f}=NO
 .   endif
 .endfor
 
+post-patch:
+	@${REINPLACE_CMD} -E '/^int[[:blank:]]+sb_lines;/d' \
+		${WRKSRC}/src/gl_screen.c
+	@${REINPLACE_CMD} -e '/text\[/s/4096/MAX_PRINTMSG/' \
+		${WRKSRC}/src/sys_linux.c
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/release/nehahra ${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MSDL}
 	${INSTALL_PROGRAM} ${WRKSRC}/release/nehahra-sdl ${STAGEDIR}${PREFIX}/bin
 .endif
 	@${MKDIR} ${STAGEDIR}${Q1DIR}/nehahra
 
 .include <bsd.port.mk>
+
+PATCH_ARGS+=	-l
diff --git a/games/nehquake/files/patch-Makefile b/games/nehquake/files/patch-Makefile
index a83f9531ab5e..73f03aa0d8c4 100644
--- a/games/nehquake/files/patch-Makefile
+++ b/games/nehquake/files/patch-Makefile
@@ -1,118 +1,128 @@
---- Makefile.orig	Sat May 27 13:47:34 2006
-+++ Makefile	Sat May 27 14:04:12 2006
+--- Makefile.orig	2005-11-10 14:57:23 UTC
++++ Makefile
 @@ -9,9 +9,9 @@
  #
  
  BASEVERSION=1.09
 -VERSION=$(BASEVERSION)$(GLIBC)
 +VERSION=$(BASEVERSION)
  
 -BUILD_SDL=YES	# quake sdl glx executable (uses SDL for cdrom and sound)
 +#BUILD_SDL=YES	# quake sdl glx executable (uses SDL for cdrom and sound)
  
  ifneq (,$(findstring libc6,$(shell if [ -e /lib/libc.so.6 ];then echo libc6;fi)))
  GLIBC=-glibc
-@@ -28,32 +28,45 @@
+@@ -28,32 +28,45 @@ NOARCH=noarch
  
  MOUNT_DIR=./src
  
 -BUILD_DEBUG_DIR=debug$(ARCH)$(GLIBC)
 -BUILD_RELEASE_DIR=release$(ARCH)$(GLIBC)
 +BUILD_DEBUG_DIR=debug
 +BUILD_RELEASE_DIR=release
  
 -CC=gcc
 +CC?=gcc
 +ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
 +USE_OPTIMIZED_CFLAGS?=YES
  
 -BASE_CFLAGS=-Dstricmp=strcasecmp #-Wall
 +ifeq ($(ARCH),i386)
 +USE_X86_ASM?=YES
 +else
 +USE_X86_ASM=NO
 +endif
  
 -RELEASE_CFLAGS=$(BASE_CFLAGS) -march=i686 -O2 -ffast-math -funroll-loops \
-+BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp #-Wall
-+
+-	-fomit-frame-pointer -fexpensive-optimizations -fno-strict-aliasing
+-DEBUG_CFLAGS=$(BASE_CFLAGS) -g
++BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -Wno-implicit-function-declaration
+ 
+-LDFLAGS=-lm
 +ifeq ($(strip $(USE_X86_ASM)),YES)
 +BASE_CFLAGS+=-Did386
 +endif
-+
+ 
+-LDFLAGS += -lz -L./src/fmod -Wl,-rpath,. -lfmod
 +RELEASE_CFLAGS=$(BASE_CFLAGS)
-+
+ 
 +ifeq ($(strip $(USE_OPTIMIZED_CFLAGS)),YES)
 +RELEASE_CFLAGS+=-O2 -ffast-math -funroll-loops \
- 	-fomit-frame-pointer -fexpensive-optimizations -fno-strict-aliasing
--DEBUG_CFLAGS=$(BASE_CFLAGS) -g
++	-fomit-frame-pointer -fno-strict-aliasing
 +endif
- 
--LDFLAGS=-lm
++
 +DEBUG_CFLAGS=$(BASE_CFLAGS) -g
- 
--LDFLAGS += -lz -L./src/fmod -Wl,-rpath,. -lfmod
++
 +LDFLAGS+=-lm -lz
- 
++
  ifeq ($(strip $(BUILD_SDL)),YES)
 - SDLCFLAGS=$(shell sdl-config --cflags)
 - SDLLDFLAGS=$(shell sdl-config --libs)
 - LDFLAGS += \
 - 	-lSDL
 + SDLCFLAGS=$(shell $(SDL_CONFIG) --cflags)
 + SDLLDFLAGS=$(shell $(SDL_CONFIG) --libs)
   BASE_CFLAGS += \
      -D_SDL_BIN
  endif
  
 -GLLDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lGL -lX11 -lXext -ldl -lXxf86dga -lXxf86vm
 -GLCFLAGS=-DGLQUAKE -I/usr/include -I/usr/X11R6/include
 +GLLDFLAGS=-L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
 +GLCFLAGS=-DGLQUAKE -I$(LOCALBASE)/include
  
  DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
  DO_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) -o $@ -c $<
-@@ -70,10 +83,10 @@
+@@ -70,10 +83,10 @@ DO_GL_AS=$(CC) $(CFLAGS) $(GLCFLAGS) -DELF -x assemble
  #############################################################################
  
  
 -	TARGETS=$(BUILDDIR)/nehahra.glx
 +	TARGETS=$(BUILDDIR)/nehahra
  	
  ifeq ($(strip $(BUILD_SDL)),YES)
 -	TARGETS +=$(BUILDDIR)/nehahra-sdl.glx
 +	TARGETS +=$(BUILDDIR)/nehahra-sdl
  endif
  
  all:
-@@ -165,12 +178,15 @@
+@@ -94,7 +107,7 @@ debug:
+ 	$(BUILD_DEBUG_DIR)/glquake
+ 	$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)"
+ 
+-release:
++release::
+ 	@-mkdir $(BUILD_RELEASE_DIR) \
+ 	$(BUILD_RELEASE_DIR)/glquake
+ 	$(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(RELEASE_CFLAGS)"
+@@ -165,12 +178,15 @@ GLQUAKE_OBJS= \
  	$(BUILDDIR)/glquake/sys_linux.o \
  	$(BUILDDIR)/glquake/snd_dma.o \
  	$(BUILDDIR)/glquake/snd_mem.o \
 -	$(BUILDDIR)/glquake/snd_mix.o \
 -	\
 +	$(BUILDDIR)/glquake/snd_mix.o
 +
 +ifeq ($(strip $(USE_X86_ASM)),YES)
 +GLQUAKE_OBJS+= \
  	$(BUILDDIR)/glquake/math.o \
  	$(BUILDDIR)/glquake/worlda.o \
  	$(BUILDDIR)/glquake/snd_mixa.o \
  	$(BUILDDIR)/glquake/sys_dosa.o
 +endif
  
  GLQUAKE_LNX_OBJS = \
     $(BUILDDIR)/glquake/cd_linux.o \
-@@ -182,10 +198,10 @@
+@@ -182,10 +198,10 @@ GLQUAKE_SDL_OBJS = \
  	
  GLX_OBJS=$(BUILDDIR)/glquake/gl_vidlinuxglx.o
  
 -$(BUILDDIR)/nehahra.glx : $(GLQUAKE_OBJS) $(GLQUAKE_LNX_OBJS)  $(GLX_OBJS)
 +$(BUILDDIR)/nehahra : $(GLQUAKE_OBJS) $(GLQUAKE_LNX_OBJS)  $(GLX_OBJS)
  	$(CC) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(GLX_OBJS) $(GLQUAKE_LNX_OBJS)  $(GLLDFLAGS) $(LDFLAGS)
  	
 -$(BUILDDIR)/nehahra-sdl.glx : $(GLQUAKE_OBJS) $(GLQUAKE_SDL_OBJS)  $(GLX_OBJS)
 +$(BUILDDIR)/nehahra-sdl : $(GLQUAKE_OBJS) $(GLQUAKE_SDL_OBJS)  $(GLX_OBJS)
  	$(CC) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(GLX_OBJS) $(GLQUAKE_SDL_OBJS)  $(GLLDFLAGS) $(LDFLAGS) $(SDLLDFLAGS)
  
  $(BUILDDIR)/glquake/cl_demo.o :      $(MOUNT_DIR)/cl_demo.c
diff --git a/games/nehquake/files/patch-src__glquake.h b/games/nehquake/files/patch-src__glquake.h
index dd490a83779f..cfb77303b314 100644
--- a/games/nehquake/files/patch-src__glquake.h
+++ b/games/nehquake/files/patch-src__glquake.h
@@ -1,10 +1,16 @@
---- ./src/glquake.h.orig	Tue Sep 27 19:06:49 2005
-+++ ./src/glquake.h	Tue May 16 17:36:22 2006
-@@ -275,7 +275,6 @@
+--- src/glquake.h.orig	2005-09-27 22:06:49 UTC
++++ src/glquake.h
+@@ -275,7 +275,6 @@ extern GLenum gl_Texture1;
  #define    TEXTURE1_SGIS gl_Texture1
  
  #ifndef _WIN32
 -#define APIENTRY /* */
  #endif
  
  typedef void (APIENTRY *lpMTexFUNC) (GLenum, GLfloat, GLfloat);
+@@ -289,4 +288,4 @@ void GL_DisableMultitexture(void);
+ void GL_EnableMultitexture(void);
+ void GL_LightMaps_f (void);
+ 
+-extern   bspversion;
++extern int bspversion;
diff --git a/games/nehquake/files/patch-src__quakedef.h b/games/nehquake/files/patch-src__quakedef.h
index 5e94e1b477ab..e25c9f65d293 100644
--- a/games/nehquake/files/patch-src__quakedef.h
+++ b/games/nehquake/files/patch-src__quakedef.h
@@ -1,11 +1,20 @@
---- ./src/quakedef.h.orig	Tue Sep 27 13:41:52 2005
-+++ ./src/quakedef.h	Tue May 16 17:48:38 2006
-@@ -337,7 +337,7 @@
+--- src/quakedef.h.orig	2005-09-27 16:41:52 UTC
++++ src/quakedef.h
+@@ -101,7 +101,7 @@ void	VID_UnlockBuffer (void);
+ #define MAX_MSGLEN              65536 //8192            // max length of a reliable message
+ #define MAX_DATAGRAM            65536 //3027            // max length of unreliable message
+ 
+-#define	MAX_PRINTMSG		4096
++#define	MAX_PRINTMSG		16384
+ 
+ //
+ // per-level limits
+@@ -337,7 +337,7 @@ void Chase_Reset (void);
  void Chase_Update (void);
  
  extern int bspversion;
 -#ifdef __linux
 +#ifdef __unix__
  #ifndef min
  #define min(a, b)  (((a) < (b)) ? (a) : (b))
  #endif
diff --git a/games/nehquake/files/pkg-message.in b/games/nehquake/files/pkg-message.in
index af45234bb45f..6f696193da92 100644
--- a/games/nehquake/files/pkg-message.in
+++ b/games/nehquake/files/pkg-message.in
@@ -1,9 +1,15 @@
 [
 { type: install
   message: <<EOM
-To complete the instalation of this port you have download the Nehahra data
-files from "http://planetquake.com/nehahra/" and extract them to
-"%%Q1DIR%%/nehahra".
+To complete the installation of this port, download Nehahra mod
+from https://www.quaddicted.com/filebase/nehahra.zip and unpack
+its "nehahra" subdirectory as "%%Q1DIR%%/nehahra".
+
+If you see the following error when loading certain large maps,
+
+    Error: Cache_TryAlloc: 1627728 is greater then free hunk
+
+run the game with e.g. ``-mem 64'' option (memory in megabytes).
 EOM
 }
 ]