diff --git a/debian/patches/0011-Fix-definition-of-GLsizeiptr.patch b/debian/patches/0011-Fix-definition-of-GLsizeiptr.patch
new file mode 100644
index 0000000..e9f384d
--- /dev/null
+++ b/debian/patches/0011-Fix-definition-of-GLsizeiptr.patch
@@ -0,0 +1,40 @@
+From: Jochen Sprickerhof <jspricke@debian.org>
+Date: Mon, 29 Mar 2021 19:48:13 +0200
+Subject: Fix definition of GLsizeiptr
+
+---
+ j3d-core/src/native/ogl/glext.h | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/j3d-core/src/native/ogl/glext.h b/j3d-core/src/native/ogl/glext.h
+index 2519a6c..71ff798 100644
+--- a/j3d-core/src/native/ogl/glext.h
++++ b/j3d-core/src/native/ogl/glext.h
+@@ -43,6 +43,8 @@ extern "C" {
+ #define GLAPI extern
+ #endif
+ 
++#include <KHR/khrplatform.h>
++
+ /*************************************************************/
+ 
+ /* Header file version number, required by OpenGL ABI for Linux */
+@@ -3390,14 +3392,14 @@ typedef char GLchar;			/* native character */
+ 
+ #ifndef GL_VERSION_1_5
+ /* GL types for handling large vertex buffer objects */
+-typedef ptrdiff_t GLintptr;
+-typedef ptrdiff_t GLsizeiptr;
++typedef khronos_intptr_t GLintptr;
++typedef khronos_ssize_t GLsizeiptr;
+ #endif
+ 
+ #ifndef GL_ARB_vertex_buffer_object
+ /* GL types for handling large vertex buffer objects */
+-typedef ptrdiff_t GLintptrARB;
+-typedef ptrdiff_t GLsizeiptrARB;
++typedef khronos_intptr_t GLintptrARB;
++typedef khronos_ssize_t GLsizeiptrARB;
+ #endif
+ 
+ #ifndef GL_ARB_shader_objects
diff --git a/debian/patches/series b/debian/patches/series
index 4ceba7b..f6a7960 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,6 @@
 05_pic_amd64.patch
 05_pic_i586.patch
 06_java-compat.patch
-typedef.patch
 07_java9_compatibility.patch
 08_java10_compatibility.patch
+0011-Fix-definition-of-GLsizeiptr.patch
diff --git a/debian/patches/typedef.patch b/debian/patches/typedef.patch
deleted file mode 100644
index 942057e..0000000
--- a/debian/patches/typedef.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Markus Koschany <apo@gambaru.de>
-Date: Sat, 22 Nov 2014 23:54:59 +0100
-Subject: typedef
-
-Define GLsizeiptr and GLintptr explicitly to prevent a FTBFS.
-This patch may be removed in the future when
-https://bugs.debian.org/765933 gets fixed.
-
-Bug: https://bugs.debian.org/769301
-Forwarded: no
----
- j3d-core/src/native/ogl/gldefs.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/j3d-core/src/native/ogl/gldefs.h b/j3d-core/src/native/ogl/gldefs.h
-index bf4434f..d20de17 100644
---- a/j3d-core/src/native/ogl/gldefs.h
-+++ b/j3d-core/src/native/ogl/gldefs.h
-@@ -65,6 +65,8 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- 
-+typedef ptrdiff_t GLsizeiptr;
-+typedef ptrdiff_t GLintptr;
- #include <GL/gl.h>
- #include <GL/glx.h>
- #ifdef Java3D_undef__glext_h_