diff --git a/games/luola/Makefile b/games/luola/Makefile
index 23ecc7fefc8a..3b3ca7befa31 100644
--- a/games/luola/Makefile
+++ b/games/luola/Makefile
@@ -1,58 +1,54 @@
 PORTNAME=	luola
 PORTVERSION=	1.3.2
 PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/${DIST_SUBDIR}/ # master site gone
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		stdlevels-6.0${EXTRACT_SUFX} \
 		nostalgia-1.2${EXTRACT_SUFX}
 DIST_SUBDIR=	luola
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	2D multiplayer cave-flying game
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: Pilot
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: Pilot
-
-GNU_CONFIGURE=	yes
 USES=		gmake sdl
+GNU_CONFIGURE=	yes
 USE_SDL=	sdl image ttf
-CONFIGURE_ARGS=	--program-prefix=''
 LIBS+=		-lm
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.png
 PORTDOCS=	*
 PORTDATA=	*
 
 DESKTOP_ENTRIES="Luola" \
 		"" \
 		"luola" \
 		"luola" \
 		"Game;ArcadeGame;" \
 		false
 
 OPTIONS_DEFINE=	SDL_GFX SOUND DOCS
 OPTIONS_DEFAULT=SDL_GFX SOUND
 
-SDL_GFX_DESC=	Nicer graphics
+SDL_GFX_DESC=		Nicer graphics with SDL_gfx
 SDL_GFX_USE=		SDL=gfx
 SDL_GFX_CONFIGURE_ENABLE=sdl-gfx
 SOUND_USE=		SDL=mixer
 SOUND_CONFIGURE_ENABLE=	sound
 
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBS=.*-lSDL_/ s|\(SDL_[a-z]*\)|\1 `sdl-config --libs`|' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/*.lev ${WRKDIR}/*.png ${STAGEDIR}${DATADIR}/levels/
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/FAQ ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/luola/files/patch-src__fs.h b/games/luola/files/patch-src__fs.h
index 1e947bae8701..989831598ee3 100644
--- a/games/luola/files/patch-src__fs.h
+++ b/games/luola/files/patch-src__fs.h
@@ -1,10 +1,10 @@
 --- src/fs.h.orig	2006-01-31 17:46:24 UTC
 +++ src/fs.h
 @@ -25,6 +25,7 @@
  #define FILESYSTEM_H
  
  #include <stdio.h>
-+#include <sys/syslimits.h>
++#include <limits.h>
  #include "SDL.h"
  
  #include "ldat.h"
diff --git a/games/luola/files/patch-src_pilot.c b/games/luola/files/patch-src_pilot.c
new file mode 100644
index 000000000000..510d72347f3b
--- /dev/null
+++ b/games/luola/files/patch-src_pilot.c
@@ -0,0 +1,11 @@
+--- src/pilot.c.orig	2022-07-02 17:04:58 UTC
++++ src/pilot.c
+@@ -43,6 +43,8 @@
+ #define PILOT_STD_RADIUS 4.1 /* Normal radius for pilot */
+ #define PILOT_PAR_RADIUS 8.0 /* Parachuting radius for pilot */
+ 
++struct Pilot Pilot = {};
++
+ /* List of active pilots */
+ struct dllist *pilot_list;
+ 
diff --git a/games/luola/files/patch-src_pilot.h b/games/luola/files/patch-src_pilot.h
new file mode 100644
index 000000000000..6882199fce06
--- /dev/null
+++ b/games/luola/files/patch-src_pilot.h
@@ -0,0 +1,11 @@
+--- src/pilot.h.orig	2022-07-02 17:04:35 UTC
++++ src/pilot.h
+@@ -34,7 +34,7 @@ struct Ship;
+ 
+ #define PARACHUTE_FRAME 2
+ 
+-struct Pilot {
++extern struct Pilot {
+     struct Walker walker;       /* inherits Walker */
+     SDL_Surface *sprite[3];     /* Normal,Normal2, Parachute */
+     Vector attack_vector;       /* Direction where gun is pointed to */