diff --git a/src/java/org/lwjgl/opengl/GL.java b/src/java/org/lwjgl/opengl/GL.java
index eea8cbc6..f6a6c917 100644
--- a/src/java/org/lwjgl/opengl/GL.java
+++ b/src/java/org/lwjgl/opengl/GL.java
@@ -1299,6 +1299,14 @@ public class GL extends CoreGL implements GLConstants {
 
 	public native void weightusvARB(int size, int psWeights);
 
+	public static native int glXAllocateMemoryNV(
+		int size,
+		float readFrequency,
+		float writeFrequency,
+		float priority);
+
+	public static native void glXFreeMemoryNV(int pointer);
+
 	// #ifdef _WIN32
 
 	public static native int wglAllocateMemoryNV(
diff --git a/src/native/common/org_lwjgl_opengl_GL.cpp b/src/native/common/org_lwjgl_opengl_GL.cpp
index bd43f681..3280d7d8 100644
--- a/src/native/common/org_lwjgl_opengl_GL.cpp
+++ b/src/native/common/org_lwjgl_opengl_GL.cpp
@@ -3696,6 +3696,29 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_weightusvARB(JNIEnv * env, jobje
 	glWeightusvARB((GLint) p0, (GLushort *) p1);
 }
 
+/*
+ * Class:     org_lwjgl_opengl_GL
+ * Method:    glXAllocateMemoryNV
+ */
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GL_glXAllocateMemoryNV(JNIEnv * env, jclass clazz, jint p0, jfloat p1, jfloat p2, jfloat p3)
+{
+#ifdef _X11
+	jint ret = (jint) glXAllocateMemoryNV((GLint) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3);
+	return ret;
+#endif
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GL
+ * Method:    wglFreeMemoryNV
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glXFreeMemoryNV(JNIEnv * env, jclass clazz, jint p0)
+{
+#ifdef _X11
+	glXFreeMemoryNV((void *) p0);
+#endif
+}
+
 /*
  * Class:     org_lwjgl_opengl_GL
  * Method:    wglAllocateMemoryNV
diff --git a/src/native/common/org_lwjgl_opengl_GL.h b/src/native/common/org_lwjgl_opengl_GL.h
index cd619989..b58d1013 100644
--- a/src/native/common/org_lwjgl_opengl_GL.h
+++ b/src/native/common/org_lwjgl_opengl_GL.h
@@ -9,15 +9,15 @@ extern "C" {
 #endif
 /* Inaccessible static: _00024assertionsDisabled */
 /* Inaccessible static: currentContext */
-/* Inaccessible static: class_000240 */
+/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024BaseGL */
 /* Inaccessible static: WGL_ARB_buffer_region */
 /* Inaccessible static: WGL_ARB_extensions_string */
 /* Inaccessible static: WGL_ARB_pbuffer */
 /* Inaccessible static: WGL_ARB_pixel_format */
 /* Inaccessible static: WGL_ARB_render_texture */
 /* Inaccessible static: WGL_EXT_extensions_string */
-/* Inaccessible static: class_000240 */
-/* Inaccessible static: class_000241 */
+/* Inaccessible static: WGL_EXT_swap_control */
+/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GL */
 /*
  * Class:     org_lwjgl_opengl_GL
  * Method:    activeStencilFaceEXT
@@ -3034,6 +3034,22 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_weightuivARB
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_weightusvARB
   (JNIEnv *, jobject, jint, jint);
 
+/*
+ * Class:     org_lwjgl_opengl_GL
+ * Method:    glXAllocateMemoryNV
+ * Signature: (IFFF)I
+ */
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GL_glXAllocateMemoryNV
+  (JNIEnv *, jclass, jint, jfloat, jfloat, jfloat);
+
+/*
+ * Class:     org_lwjgl_opengl_GL
+ * Method:    glXFreeMemoryNV
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glXFreeMemoryNV
+  (JNIEnv *, jclass, jint);
+
 /*
  * Class:     org_lwjgl_opengl_GL
  * Method:    wglAllocateMemoryNV
@@ -3357,7 +3373,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_writeMaskEXT
 /*
  * Class:     org_lwjgl_opengl_GL
  * Method:    checkWGLExtensionsString
- * Signature: ()Z
+ * Signature: ()V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_checkWGLExtensionsString
   (JNIEnv *, jclass);