diff --git a/Source/Bind/Specifications/GL2/enumext.spec b/Source/Bind/Specifications/GL2/enumext.spec
index 6834d3a2..2aa1c576 100644
--- a/Source/Bind/Specifications/GL2/enumext.spec
+++ b/Source/Bind/Specifications/GL2/enumext.spec
@@ -6483,7 +6483,15 @@ GetPName enum:
 IndexedStringName enum:
 	use StringName EXTENSIONS				# Used in GetStringi
 
-# Non-core  changes:
+# Version 3.1 
+
+# Promoted from ARB_copy_buffer
+BufferTarget enum:
+    use ARB_copy_buffer COPY_READ_BUFFER
+    use ARB_copy_buffer COPY_WRITE_BUFFER
+
+# Non-core 
+
 # APPLE_flush_buffer_range
 Buffer_Parameter_Apple enum:
 	use APPLE_flush_buffer_range BUFFER_SERIALIZED_MODIFY_APPLE
diff --git a/Source/Bind/Specifications/GL2/gl.spec b/Source/Bind/Specifications/GL2/gl.spec
index e47f86db..308fa0b7 100644
--- a/Source/Bind/Specifications/GL2/gl.spec
+++ b/Source/Bind/Specifications/GL2/gl.spec
@@ -11380,8 +11380,8 @@ newcategory: ARB_compatibility
 
 CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size)
 	return		void
-	param		readTarget	GLenum in value
-	param		writeTarget	GLenum in value
+	param		readTarget		BufferTarget in value # GLenum in value
+	param		writeTarget	BufferTarget in value # GLenum in value
 	param		readOffset	BufferOffset in value
 	param		writeOffset	BufferOffset in value
 	param		size		BufferSize in value
diff --git a/Source/OpenTK/Graphics/GL/GL.cs b/Source/OpenTK/Graphics/GL/GL.cs
index b836d4a6..c396983f 100644
--- a/Source/OpenTK/Graphics/GL/GL.cs
+++ b/Source/OpenTK/Graphics/GL/GL.cs
@@ -54720,13 +54720,13 @@ namespace OpenTK.Graphics
 
         [AutoGenerated(Category = "ArbCopyBuffer", Version = "3.0", EntryPoint = "glCopyBufferSubData")]
         public static 
-        void CopyBufferSubData(OpenTK.Graphics.ArbCopyBuffer readTarget, OpenTK.Graphics.ArbCopyBuffer writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size)
+        void CopyBufferSubData(OpenTK.Graphics.BufferTarget readTarget, OpenTK.Graphics.BufferTarget writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glCopyBufferSubData((OpenTK.Graphics.ArbCopyBuffer)readTarget, (OpenTK.Graphics.ArbCopyBuffer)writeTarget, (IntPtr)readOffset, (IntPtr)writeOffset, (IntPtr)size);
+            Delegates.glCopyBufferSubData((OpenTK.Graphics.BufferTarget)readTarget, (OpenTK.Graphics.BufferTarget)writeTarget, (IntPtr)readOffset, (IntPtr)writeOffset, (IntPtr)size);
             #if DEBUG
             }
             #endif
diff --git a/Source/OpenTK/Graphics/GL/GLCore.cs b/Source/OpenTK/Graphics/GL/GLCore.cs
index 9d3aaa3e..996ed4fa 100644
--- a/Source/OpenTK/Graphics/GL/GLCore.cs
+++ b/Source/OpenTK/Graphics/GL/GLCore.cs
@@ -2062,7 +2062,7 @@ namespace OpenTK.Graphics
             internal extern static void UniformBlockBinding(UInt32 program, UInt32 uniformBlockIndex, UInt32 uniformBlockBinding);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glCopyBufferSubData", ExactSpelling = true)]
-            internal extern static void CopyBufferSubData(OpenTK.Graphics.ArbCopyBuffer readTarget, OpenTK.Graphics.ArbCopyBuffer writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
+            internal extern static void CopyBufferSubData(OpenTK.Graphics.BufferTarget readTarget, OpenTK.Graphics.BufferTarget writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetPerfMonitorGroupsAMD", ExactSpelling = true)]
             internal extern static unsafe void GetPerfMonitorGroupsAMD([Out] Int32* numGroups, Int32 groupsSize, [Out] UInt32* groups);
diff --git a/Source/OpenTK/Graphics/GL/GLDelegates.cs b/Source/OpenTK/Graphics/GL/GLDelegates.cs
index 93a4268d..11310a91 100644
--- a/Source/OpenTK/Graphics/GL/GLDelegates.cs
+++ b/Source/OpenTK/Graphics/GL/GLDelegates.cs
@@ -2696,7 +2696,7 @@ namespace OpenTK.Graphics
             internal delegate void UniformBlockBinding(UInt32 program, UInt32 uniformBlockIndex, UInt32 uniformBlockBinding);
             internal static UniformBlockBinding glUniformBlockBinding;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate void CopyBufferSubData(OpenTK.Graphics.ArbCopyBuffer readTarget, OpenTK.Graphics.ArbCopyBuffer writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
+            internal delegate void CopyBufferSubData(OpenTK.Graphics.BufferTarget readTarget, OpenTK.Graphics.BufferTarget writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size);
             internal static CopyBufferSubData glCopyBufferSubData;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BlendColorEXT(Single red, Single green, Single blue, Single alpha);
diff --git a/Source/OpenTK/Graphics/GL/GLEnums.cs b/Source/OpenTK/Graphics/GL/GLEnums.cs
index 9887a174..e64679f9 100644
--- a/Source/OpenTK/Graphics/GL/GLEnums.cs
+++ b/Source/OpenTK/Graphics/GL/GLEnums.cs
@@ -9634,6 +9634,8 @@ namespace OpenTK.Graphics
         ElementArrayBuffer = ((int)0X8893),
         PixelPackBuffer = ((int)0X88eb),
         PixelUnpackBuffer = ((int)0X88ec),
+        CopyReadBuffer = ((int)0X8f36),
+        CopyWriteBuffer = ((int)0X8f37),
     }
 
     public enum BufferUsageHint