diff --git a/src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java b/src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java
new file mode 100644
index 00000000..dd7de32d
--- /dev/null
+++ b/src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2002-2010 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+public interface AMD_query_buffer_object {
+
+	/**
+	 * Accepted by the <pname> parameter of GetQueryObjectiv, GetQueryObjectuiv,
+	 * GetQueryObjecti64v and GetQueryObjectui64v:
+	 */
+	int GL_QUERY_RESULT_NO_WAIT_AMD = 0x9194;
+
+	/**
+	 * Accepted by the <target> parameters of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, UnmapBuffer, MapBufferRange, GetBufferSubData,
+	 * GetBufferParameteriv
+	 * and GetBufferPointerv:
+	 */
+	int GL_QUERY_BUFFER_AMD = 0x9192;
+
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * and GetDoublev:
+	 */
+	int GL_QUERY_BUFFER_BINDING_AMD = 0x9193;
+
+}
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opengl/GL30.java b/src/templates/org/lwjgl/opengl/GL30.java
index 22f27f8c..0633e1e4 100644
--- a/src/templates/org/lwjgl/opengl/GL30.java
+++ b/src/templates/org/lwjgl/opengl/GL30.java
@@ -907,12 +907,6 @@ public interface GL30 {
 	int GL_RG = 0x8227;
 	int GL_RG_INTEGER = 0x8228;
 
-	/**
-	 * Accepted by the <param> parameter of the TexParameter{if}*
-	 * functions when <pname> is DEPTH_TEXTURE_MODE:
-	 */
-	int GL_RED = 0x1903;
-
 	// ----------------------------------------------------------------------
 	// ----------------------[ EXT_transform_feedback ]----------------------
 	// ----------------------------------------------------------------------