diff --git a/games-fps/gzdoom/gzdoom-3.5.1.recipe b/games-fps/gzdoom/gzdoom-3.5.1.recipe
index aa020bd4c..615fa09d7 100644
--- a/games-fps/gzdoom/gzdoom-3.5.1.recipe
+++ b/games-fps/gzdoom/gzdoom-3.5.1.recipe
@@ -40,10 +40,10 @@ COPYRIGHT="
 	1997 id Software, Raven Software, and contributors
 	"
 LICENSE="GNU GPL v3"
-REVISION="1"
-SOURCE_URI="https://github.com/coelckers/gzdoom/archive/g$portVersion.tar.gz"
-CHECKSUM_SHA256="6189ac5328a835b28246c0a7a7449f8cb7f71a4f2c9868ff5315a2f598849096"
-SOURCE_DIR="gzdoom-g$portVersion"
+REVISION="2"
+SOURCE_URI="https://zdoom.org/files/gzdoom/src/gzdoom-src-g3.5.1_legacy.zip"
+CHECKSUM_SHA256="76393c09799655b5dc1225c6f069621b7d9bf43f082741a20e67fd8479486c04"
+SOURCE_DIR="gzdoom-g3.5.1_legacy"
 PATCHES="gzdoom-$portVersion.patchset"
 ADDITIONAL_FILES="gzdoom.rdef.in"
 
diff --git a/games-fps/gzdoom/patches/gzdoom-3.5.1.patchset b/games-fps/gzdoom/patches/gzdoom-3.5.1.patchset
index e8d816d13..780e5ca10 100644
--- a/games-fps/gzdoom/patches/gzdoom-3.5.1.patchset
+++ b/games-fps/gzdoom/patches/gzdoom-3.5.1.patchset
@@ -1,6 +1,6 @@
-From 00f8ebcd4207cfec01b72a05b8df4c9f28649da8 Mon Sep 17 00:00:00 2001
+From ebd669cc76f8352ff1999d5558fa64332ae7b1fa Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
-Date: Thu, 11 Oct 2018 14:21:49 +0300
+Date: Fri, 12 Oct 2018 13:14:10 +0300
 Subject: Haiku fixes
 
 
@@ -23,21 +23,17 @@ index 032dbb1..70c9c47 100644
  set( CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} ${REL_LINKER_FLAGS}" )
  set( CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} ${REL_LINKER_FLAGS}" )
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b4ec9a4..af017e7 100644
+index 2e29a22..3a107a8 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -404,9 +404,9 @@ endif()
+@@ -404,7 +404,7 @@ endif()
  CHECK_CXX_SOURCE_COMPILES("thread_local int i; int main() { i = 0; }"
  	HAVE_THREAD_LOCAL)
  
 -if( NOT HAVE_THREAD_LOCAL )
--	message( SEND_ERROR "C++ compiler doesn't support thread_local storage duration specifier" )
--endif()
-+#if( NOT HAVE_THREAD_LOCAL )
-+#	message( SEND_ERROR "C++ compiler doesn't support thread_local storage duration specifier" )
-+#endif()
- 
- # Check for functions that may or may not exist.
++if( NOT HAVE_THREAD_LOCAL AND NOT HAIKU)
+ 	message( SEND_ERROR "C++ compiler doesn't support thread_local storage duration specifier" )
+ endif()
  
 diff --git a/src/gl_load/gl_load.c b/src/gl_load/gl_load.c
 index 4bfbb78..405444e 100644
@@ -52,20 +48,6 @@ index 4bfbb78..405444e 100644
  			void* SDL_GL_GetProcAddress(const char* proc);
  			#define IntGetProcAddress(name) SDL_GL_GetProcAddress((const char*)name)
  			//#define IntGetProcAddress(name) PosixGetProcAddress((const GLubyte*)name)
-diff --git a/src/m_alloc.cpp b/src/m_alloc.cpp
-index d08913b..50b4289 100644
---- a/src/m_alloc.cpp
-+++ b/src/m_alloc.cpp
-@@ -40,6 +40,9 @@
- #include <malloc/malloc.h>
- #elif defined(__OpenBSD__)
- #include <stdlib.h>
-+#elif defined(__APPLE__)
-+#include <stdlib.h>
-+#include <malloc.h>
- #else
- #include <malloc.h>
- #endif
 diff --git a/src/posix/i_system.h b/src/posix/i_system.h
 index 7f468f1..d1e0169 100644
 --- a/src/posix/i_system.h