diff --git a/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe b/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe
index 07070d5f5..1122023e0 100644
--- a/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe
+++ b/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe
@@ -1,47 +1,47 @@
 SUMMARY="A top down Formula One racing game"
-DESCRIPTION="
-Race against your opponents on 21 tracks. Features online high scores, \
-realtime rain effect, split-screen multiplayer, and more!"
+DESCRIPTION="Race against your opponents on 21 tracks. Features online high \
+scores, realtime rain effect, split-screen multiplayer, and more!"
 HOMEPAGE="http://www2.braingames.getput.com/f1spirit/"
 COPYRIGHT="2002-2008 Brain Games"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="http://braingames.jorito.net/f1spirit/f1spirit.src_0.rc9-1615.tgz"
-CHECKSUM_SHA256="fc1778dcec68ccd31b9da893abee67e64a7931a34c75a63f8563355b810acbd7"
+CHECKSUM_SHA256="bfde090fdd90546d1b46ed0dbf73cb8e6c8dab3f521c278c403542750dd1b02c"
 PATCHES="$portName-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
 	$portName = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libcurl$secondaryArchSuffix
-	lib:libglu$secondaryArchSuffix
-	lib:libsdl$secondaryArchSuffix
-	lib:libSDL_image$secondaryArchSuffix
-	lib:libSDL_mixer$secondaryArchSuffix
-	lib:libSDL_net_1.2$secondaryArchSuffix
-	lib:libssl$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
+	haiku
+	lib:libcurl
+	lib:libGLU
+	lib:libnghttp2
+	lib:libSDL_1.2
+	lib:libSDL_image_1.2
+	lib:libSDL_mixer_1.2
+	lib:libSDL_net_1.2
+	lib:libssl
+	lib:libz
 	"
 
 BUILD_REQUIRES="
-	devel:libcurl$secondaryArchSuffix
-	devel:libglu$secondaryArchSuffix
-	devel:libsdl$secondaryArchSuffix
-	devel:libSDL_image$secondaryArchSuffix
-	devel:libSDL_mixer$secondaryArchSuffix
-	devel:libSDL_net_1.2$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
+	haiku_devel
+	devel:libcurl
+	devel:libGLU
+	devel:libnghttp2
+	devel:libSDL
+	devel:libSDL_image
+	devel:libSDL_mixer
+	devel:libSDL_net
+	devel:libssl
+	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	haiku_devel
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
+	cmd:g++
+	cmd:ld
 	cmd:make
 	"
 
@@ -55,6 +55,7 @@ INSTALL()
 	installDir=$appsDir/"F-1 Spirit"
 	mkdir -p "$installDir"
 	make install PREFIX="$installDir" GAMEDIR="$installDir"
+	rm -rf "$installDir"/share/{applications,pixmaps}
 
 	cd "$installDir"
 	echo -e "#!/bin/sh\ncd \"$installDir\"/share/games/f1spirit && ./f1spirit" > f1spirit
diff --git a/games-arcade/f1spirit/patches/f1spirit-0.rc9.1615.patchset b/games-arcade/f1spirit/patches/f1spirit-0.rc9.1615.patchset
index 42b1952b1..cdf94cbfe 100644
--- a/games-arcade/f1spirit/patches/f1spirit-0.rc9.1615.patchset
+++ b/games-arcade/f1spirit/patches/f1spirit-0.rc9.1615.patchset
@@ -1,4 +1,4 @@
-From 9c38447f0d58b6ff39e7304ba9f63a82cbed5f92 Mon Sep 17 00:00:00 2001
+From 8cb02f7c057b303a0e0164d95f880f42bcec8731 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Tue, 21 Jan 2014 22:40:24 +0100
 Subject: Remove outdated include.
@@ -17,10 +17,10 @@ index 59a213c..9cb48cc 100644
  
  #include "F1Shttp.h"
 -- 
-2.2.2
+2.21.0
 
 
-From 235e4f4d2a1be22b66534f343eb03fa722d159bd Mon Sep 17 00:00:00 2001
+From b1c60fe6ae380158e9b137c5a29415d5bf7067a3 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Fri, 13 Nov 2015 09:33:23 +0100
 Subject: Fix settings directory
@@ -81,5 +81,53 @@ index 4aa1c99..b1a9f89 100644
  		dp = opendir(dir);
  
 -- 
-2.2.2
+2.21.0
+
+
+From 0bdf3b49ebb4c74d67b096aa4214da3f42067ea3 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 14 Jul 2019 08:53:32 +0200
+Subject: Fix build with gcc8
+
+
+diff --git a/build/linux/Makefile b/build/linux/Makefile
+index f3069a3..ba9ab7d 100644
+--- a/build/linux/Makefile
++++ b/build/linux/Makefile
+@@ -38,7 +38,7 @@ OBJS = \
+ 	$(SRC)/Vector.o					$(SRC)/weather.o				\
+ 	$(SRC)/filehandling.o			$(SRC)/CarEngineSound.o
+ 
+-CC = gcc
++CC = g++
+ #CFLAGS = -g3 -O3 -Wall `sdl-config --cflags` `curl-config --cflags` -I/usr/X11R6/include
+ CFLAGS = -g3 -O3 -Wno-write-strings `sdl-config --cflags` `curl-config --cflags` -I/usr/X11R6/include
+ LDFLAGS = `sdl-config --libs` `curl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU
+diff --git a/sources/auxiliar.cpp b/sources/auxiliar.cpp
+index d0c92e9..72c1a6f 100644
+--- a/sources/auxiliar.cpp
++++ b/sources/auxiliar.cpp
+@@ -11,6 +11,11 @@
+ #include "math.h"
+ #include "string.h"
+ 
++#ifdef __HAIKU__
++typedef int boolean;
++#define HAVE_BOOLEAN
++#endif
++
+ #include "SDL.h"
+ #include "SDL_image.h"
+ 
+@@ -93,7 +98,7 @@ SDL_Surface *load_maskedimage(char *imagefile, char *maskfile, char *path)
+ 
+ 	if (tmp == 0 ||
+ 	        mask == 0)
+-		return false;
++		return (boolean)false;
+ 
+ 	res = SDL_DisplayFormatAlpha(tmp);
+ 
+-- 
+2.21.0