diff --git a/Source/Bind/Specifications/GL2/overrides.xml b/Source/Bind/Specifications/GL2/overrides.xml
index a72186de..e6d6fc7b 100644
--- a/Source/Bind/Specifications/GL2/overrides.xml
+++ b/Source/Bind/Specifications/GL2/overrides.xml
@@ -1662,6 +1662,20 @@
     <function name="MultiDrawElements">
       <param name="mode"><type>BeginMode</type></param>
     </function>
+    
+    <!-- StencilFace <=> CullFaceMode -->
+    <function name="StencilFuncSeparate" obsolete="Use StencilFace instead" extension="Core">
+      <param name="face"><type>CullFaceMode</type></param>
+    </function>
+    <function name="StencilOpSeparate" obsolete="Use StencilFace instead" extension="Core">
+      <param name="face"><type>CullFaceMode</type></param>
+    </function>
+    
+    <!-- StencilFace <=> Version20 -->
+    <function name="StencilFuncSeparate" obsolete="Use StencilFace instead" extension="Core">
+      <param name="face"><type>Version20</type></param>
+    </function>
+    
     <!--
     <function name="TexImage1D" category="VERSION_1_0" extension="Core" version="1.0">
       <param name="target" type="TextureTarget" flow="in" />
diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs
index e1596382..33945687 100644
--- a/Source/OpenTK/Graphics/OpenGL/GL.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GL.cs
@@ -113517,6 +113517,81 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v2.0]
+        /// Set front and/or back function and reference value for stencil testing
+        /// </summary>
+        /// <param name="face">
+        /// <para>
+        /// Specifies whether front and/or back stencil state is updated. Three symbolic constants are valid: GL_FRONT, GL_BACK, and GL_FRONT_AND_BACK.
+        /// </para>
+        /// </param>
+        /// <param name="func">
+        /// <para>
+        /// Specifies the test function. Eight symbolic constants are valid: GL_NEVER, GL_LESS, GL_LEQUAL, GL_GREATER, GL_GEQUAL, GL_EQUAL, GL_NOTEQUAL, and GL_ALWAYS. The initial value is GL_ALWAYS.
+        /// </para>
+        /// </param>
+        /// <param name="ref">
+        /// <para>
+        /// Specifies the reference value for the stencil test. ref is clamped to the range [0, 2 sup n - 1], where is the number of bitplanes in the stencil buffer. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="mask">
+        /// <para>
+        /// Specifies a mask that is ANDed with both the reference value and the stored stencil value when the test is done. The initial value is all 1's.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glStencilFuncSeparate")]
+        public static 
+        void StencilFuncSeparate(OpenTK.Graphics.OpenGL.CullFaceMode face, OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, Int32 mask)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glStencilFuncSeparate((OpenTK.Graphics.OpenGL.StencilFace)face, (OpenTK.Graphics.OpenGL.StencilFunction)func, (Int32)@ref, (UInt32)mask);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v2.0]
+        /// Set front and/or back function and reference value for stencil testing
+        /// </summary>
+        /// <param name="face">
+        /// <para>
+        /// Specifies whether front and/or back stencil state is updated. Three symbolic constants are valid: GL_FRONT, GL_BACK, and GL_FRONT_AND_BACK.
+        /// </para>
+        /// </param>
+        /// <param name="func">
+        /// <para>
+        /// Specifies the test function. Eight symbolic constants are valid: GL_NEVER, GL_LESS, GL_LEQUAL, GL_GREATER, GL_GEQUAL, GL_EQUAL, GL_NOTEQUAL, and GL_ALWAYS. The initial value is GL_ALWAYS.
+        /// </para>
+        /// </param>
+        /// <param name="ref">
+        /// <para>
+        /// Specifies the reference value for the stencil test. ref is clamped to the range [0, 2 sup n - 1], where is the number of bitplanes in the stencil buffer. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="mask">
+        /// <para>
+        /// Specifies a mask that is ANDed with both the reference value and the stored stencil value when the test is done. The initial value is all 1's.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glStencilFuncSeparate")]
+        public static 
+        void StencilFuncSeparate(OpenTK.Graphics.OpenGL.CullFaceMode face, OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, UInt32 mask)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glStencilFuncSeparate((OpenTK.Graphics.OpenGL.StencilFace)face, (OpenTK.Graphics.OpenGL.StencilFunction)func, (Int32)@ref, (UInt32)mask);
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v2.0]
         /// Set front and/or back function and reference value for stencil testing
         /// </summary>
@@ -113592,6 +113667,81 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v2.0]
+        /// Set front and/or back function and reference value for stencil testing
+        /// </summary>
+        /// <param name="face">
+        /// <para>
+        /// Specifies whether front and/or back stencil state is updated. Three symbolic constants are valid: GL_FRONT, GL_BACK, and GL_FRONT_AND_BACK.
+        /// </para>
+        /// </param>
+        /// <param name="func">
+        /// <para>
+        /// Specifies the test function. Eight symbolic constants are valid: GL_NEVER, GL_LESS, GL_LEQUAL, GL_GREATER, GL_GEQUAL, GL_EQUAL, GL_NOTEQUAL, and GL_ALWAYS. The initial value is GL_ALWAYS.
+        /// </para>
+        /// </param>
+        /// <param name="ref">
+        /// <para>
+        /// Specifies the reference value for the stencil test. ref is clamped to the range [0, 2 sup n - 1], where is the number of bitplanes in the stencil buffer. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="mask">
+        /// <para>
+        /// Specifies a mask that is ANDed with both the reference value and the stored stencil value when the test is done. The initial value is all 1's.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glStencilFuncSeparate")]
+        public static 
+        void StencilFuncSeparate(OpenTK.Graphics.OpenGL.Version20 face, OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, Int32 mask)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glStencilFuncSeparate((OpenTK.Graphics.OpenGL.StencilFace)face, (OpenTK.Graphics.OpenGL.StencilFunction)func, (Int32)@ref, (UInt32)mask);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        /// <summary>[requires: v2.0]
+        /// Set front and/or back function and reference value for stencil testing
+        /// </summary>
+        /// <param name="face">
+        /// <para>
+        /// Specifies whether front and/or back stencil state is updated. Three symbolic constants are valid: GL_FRONT, GL_BACK, and GL_FRONT_AND_BACK.
+        /// </para>
+        /// </param>
+        /// <param name="func">
+        /// <para>
+        /// Specifies the test function. Eight symbolic constants are valid: GL_NEVER, GL_LESS, GL_LEQUAL, GL_GREATER, GL_GEQUAL, GL_EQUAL, GL_NOTEQUAL, and GL_ALWAYS. The initial value is GL_ALWAYS.
+        /// </para>
+        /// </param>
+        /// <param name="ref">
+        /// <para>
+        /// Specifies the reference value for the stencil test. ref is clamped to the range [0, 2 sup n - 1], where is the number of bitplanes in the stencil buffer. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="mask">
+        /// <para>
+        /// Specifies a mask that is ANDed with both the reference value and the stored stencil value when the test is done. The initial value is all 1's.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glStencilFuncSeparate")]
+        public static 
+        void StencilFuncSeparate(OpenTK.Graphics.OpenGL.Version20 face, OpenTK.Graphics.OpenGL.StencilFunction func, Int32 @ref, UInt32 mask)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glStencilFuncSeparate((OpenTK.Graphics.OpenGL.StencilFace)face, (OpenTK.Graphics.OpenGL.StencilFunction)func, (Int32)@ref, (UInt32)mask);
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v1.0]
         /// Control the front and back writing of individual bits in the stencil planes
         /// </summary>
@@ -113724,6 +113874,43 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        /// <summary>[requires: v2.0]
+        /// Set front and/or back stencil test actions
+        /// </summary>
+        /// <param name="face">
+        /// <para>
+        /// Specifies whether front and/or back stencil state is updated. Three symbolic constants are valid: GL_FRONT, GL_BACK, and GL_FRONT_AND_BACK.
+        /// </para>
+        /// </param>
+        /// <param name="sfail">
+        /// <para>
+        /// Specifies the action to take when the stencil test fails. Eight symbolic constants are accepted: GL_KEEP, GL_ZERO, GL_REPLACE, GL_INCR, GL_INCR_WRAP, GL_DECR, GL_DECR_WRAP, and GL_INVERT. The initial value is GL_KEEP.
+        /// </para>
+        /// </param>
+        /// <param name="dpfail">
+        /// <para>
+        /// Specifies the stencil action when the stencil test passes, but the depth test fails. dpfail accepts the same symbolic constants as sfail. The initial value is GL_KEEP.
+        /// </para>
+        /// </param>
+        /// <param name="dppass">
+        /// <para>
+        /// Specifies the stencil action when both the stencil test and the depth test pass, or when the stencil test passes and either there is no depth buffer or depth testing is not enabled. dppass accepts the same symbolic constants as sfail. The initial value is GL_KEEP.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "VERSION_2_0", Version = "2.0", EntryPoint = "glStencilOpSeparate")]
+        public static 
+        void StencilOpSeparate(OpenTK.Graphics.OpenGL.CullFaceMode face, OpenTK.Graphics.OpenGL.StencilOp sfail, OpenTK.Graphics.OpenGL.StencilOp dpfail, OpenTK.Graphics.OpenGL.StencilOp dppass)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glStencilOpSeparate((OpenTK.Graphics.OpenGL.StencilFace)face, (OpenTK.Graphics.OpenGL.StencilOp)sfail, (OpenTK.Graphics.OpenGL.StencilOp)dpfail, (OpenTK.Graphics.OpenGL.StencilOp)dppass);
+            #if DEBUG
+            }
+            #endif
+        }
+
         /// <summary>[requires: v2.0]
         /// Set front and/or back stencil test actions
         /// </summary>
diff --git a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
index 9c2790e2..993b54a7 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLEnums.cs
@@ -29329,7 +29329,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Used in GL.CullFace
+    /// Used in GL.CullFace, GL.StencilFuncSeparate and 1 other function
     /// </summary>
     public enum CullFaceMode : int
     {
@@ -55076,7 +55076,7 @@ namespace OpenTK.Graphics.OpenGL
     }
 
     /// <summary>
-    /// Not used directly.
+    /// Used in GL.StencilFuncSeparate
     /// </summary>
     public enum Version20 : int
     {