diff --git a/games/openjk/Makefile b/games/openjk/Makefile
index 56d3ca4bec6..fb6b5a6cccf 100644
--- a/games/openjk/Makefile
+++ b/games/openjk/Makefile
@@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.3 2018/04/26 02:15:18 bcallah Exp $
+# $OpenBSD: Makefile,v 1.4 2018/06/20 20:06:22 bcallah Exp $
 
 # Does not build with ports-gcc (tested on armv7)
 ONLY_FOR_ARCHS =	${CLANG_ARCHS}
 
 # Avoid future EPOCH bumps.
 COMMENT =	open source reimplementation of Jedi Academy game
-DISTNAME =	openjk-0.0.0.20180414
+DISTNAME =	openjk-0.0.0.20180608
 CATEGORIES =	games x11
 
 GH_ACCOUNT =	JACoders
 GH_PROJECT =	OpenJK
-GH_COMMIT =	698fe7c0e150b3f38e0d5d229faf36ad7948afca
+GH_COMMIT =	9736ae61da6de669dd3dc210c7be69be1d0214b3
 
 HOMEPAGE =	https://openjk.org/
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
diff --git a/games/openjk/distinfo b/games/openjk/distinfo
index 7a03d8ed8b4..df5351dd3a9 100644
--- a/games/openjk/distinfo
+++ b/games/openjk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openjk-0.0.0.20180414-698fe7c0.tar.gz) = hsk2M2I8T9+YtVdju4ygQ6O6nscZpeQ4AXPajp4qKDY=
-SIZE (openjk-0.0.0.20180414-698fe7c0.tar.gz) = 12524059
+SHA256 (openjk-0.0.0.20180608-9736ae61.tar.gz) = oxGNeUGRY/ALFStE3WuH04KfF9oSR4e041d7jXMcPX0=
+SIZE (openjk-0.0.0.20180608-9736ae61.tar.gz) = 11707842
diff --git a/games/openjk/patches/patch-code_rd-vanilla_qgl_h b/games/openjk/patches/patch-code_rd-vanilla_qgl_h
deleted file mode 100644
index ca9304bae25..00000000000
--- a/games/openjk/patches/patch-code_rd-vanilla_qgl_h
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-code_rd-vanilla_qgl_h,v 1.1.1.1 2018/01/28 16:07:58 bcallah Exp $
-
-Index: code/rd-vanilla/qgl.h
---- code/rd-vanilla/qgl.h.orig
-+++ code/rd-vanilla/qgl.h
-@@ -39,7 +39,7 @@ along with this program; if not, see <http://www.gnu.o
- #	if defined(__FX__)
- #		include <GL/fxmesa.h>
- #	endif
--#elif defined( __FreeBSD__ ) // rb010123
-+#elif defined( __FreeBSD__ ) || defined(__OpenBSD__) // rb010123
- #	include <GL/gl.h>
- #	include <GL/glx.h>
- #	if defined(__FX__)
diff --git a/games/openjk/patches/patch-codemp_rd-vanilla_qgl_h b/games/openjk/patches/patch-codemp_rd-vanilla_qgl_h
deleted file mode 100644
index 2e6269219cb..00000000000
--- a/games/openjk/patches/patch-codemp_rd-vanilla_qgl_h
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-codemp_rd-vanilla_qgl_h,v 1.1.1.1 2018/01/28 16:07:58 bcallah Exp $
-
-Index: codemp/rd-vanilla/qgl.h
---- codemp/rd-vanilla/qgl.h.orig
-+++ codemp/rd-vanilla/qgl.h
-@@ -39,7 +39,7 @@ along with this program; if not, see <http://www.gnu.o
- #	if defined(__FX__)
- #		include <GL/fxmesa.h>
- #	endif
--#elif defined( __FreeBSD__ ) // rb010123
-+#elif defined( __FreeBSD__ ) || defined(__OpenBSD__) // rb010123
- #	include <GL/gl.h>
- #	include <GL/glx.h>
- #	if defined(__FX__)