diff --git a/sys-libs/mesa/mesa-17.0.3.recipe b/sys-libs/mesa/mesa-17.0.4.recipe
similarity index 97%
rename from sys-libs/mesa/mesa-17.0.3.recipe
rename to sys-libs/mesa/mesa-17.0.4.recipe
index 5b58b24cf..8e7c012fb 100644
--- a/sys-libs/mesa/mesa-17.0.3.recipe
+++ b/sys-libs/mesa/mesa-17.0.4.recipe
@@ -6,10 +6,9 @@ providing 3D rendering to Haiku applications."
 HOMEPAGE="http://www.mesa3d.org/"
 COPYRIGHT="1999-2017 Brian Paul"
 LICENSE="MIT"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://mesa.freedesktop.org/archive/mesa-${portVersion}.tar.xz"
-CHECKSUM_SHA256="ca646f5075a002d60ef9123c8a4331cede155c01712ef945a65c59a5e69fe7ed"
-PATCHES="mesa-$portVersion.patchset"
+CHECKSUM_SHA256="1269dc8545a193932a0779b2db5bce9be4a5f6813b98c38b93b372be8362a346"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/sys-libs/mesa/patches/mesa-17.0.3.patchset b/sys-libs/mesa/patches/mesa-17.0.3.patchset
deleted file mode 100644
index 61ff6cafa..000000000
--- a/sys-libs/mesa/patches/mesa-17.0.3.patchset
+++ /dev/null
@@ -1,48 +0,0 @@
-From 60ca041bf3060a3c342f0b11498f9e0f615339ee Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sat, 19 Nov 2016 10:30:12 +0000
-Subject: Haiku patch
-
-
-diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h
-index 7da7f53..236be36 100644
---- a/src/gallium/auxiliary/util/u_debug.h
-+++ b/src/gallium/auxiliary/util/u_debug.h
-@@ -38,14 +38,13 @@
- #ifndef U_DEBUG_H_
- #define U_DEBUG_H_
- 
-+#include "os/os_misc.h"
- 
- #if defined(PIPE_OS_HAIKU)
- /* Haiku provides debug_printf in libroot with OS.h */
- #include <OS.h>
- #endif
- 
--#include "os/os_misc.h"
--
- #include "pipe/p_format.h"
- #include "pipe/p_defines.h"
- 
-diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
-index 89dd547..be73b29 100644
---- a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
-+++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
-@@ -105,8 +105,12 @@ hgl_winsys_convert_cs(enum pipe_format format)
- 
- static struct sw_displaytarget*
- hgl_winsys_displaytarget_create(struct sw_winsys* winsys,
--	unsigned textureUsage, enum pipe_format format, unsigned width,
--	unsigned height, unsigned alignment, unsigned* stride)
-+                          unsigned tex_usage,
-+                          enum pipe_format format,
-+                          unsigned width, unsigned height,
-+                          unsigned alignment,
-+                          const void *front_private,
-+                          unsigned *stride)
- {
- 	struct haiku_displaytarget* haikuDisplayTarget
- 		= CALLOC_STRUCT(haiku_displaytarget);
--- 
-2.2.2
-