diff --git a/Source/Bind/Specifications/ES20/overrides.xml b/Source/Bind/Specifications/ES20/overrides.xml
index 671cee9c..e91df299 100644
--- a/Source/Bind/Specifications/ES20/overrides.xml
+++ b/Source/Bind/Specifications/ES20/overrides.xml
@@ -9,4 +9,7 @@
   <function name="GetShaderSource" extension="Core">
     <param name="source"><flow>out</flow></param>
   </function>
+  <function name="GetProgramInfoLog" extension="Core">
+    <param name="infolog"><flow>out</flow></param>
+  </function>
 </overrides>
diff --git a/Source/OpenTK/Graphics/ES20/Core.cs b/Source/OpenTK/Graphics/ES20/Core.cs
index 3fb9b3cb..c1fbda1a 100644
--- a/Source/OpenTK/Graphics/ES20/Core.cs
+++ b/Source/OpenTK/Graphics/ES20/Core.cs
@@ -310,7 +310,7 @@ namespace OpenTK.Graphics.ES20
             internal extern static unsafe void GetProgramBinaryOES(UInt32 program, Int32 bufSize, Int32* length, OpenTK.Graphics.ES20.All* binaryFormat, IntPtr binary);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramInfoLog", ExactSpelling = true)]
-            internal extern static unsafe void GetProgramInfoLog(UInt32 program, Int32 bufsize, Int32* length, String infolog);
+            internal extern static unsafe void GetProgramInfoLog(UInt32 program, Int32 bufsize, Int32* length, [OutAttribute] System.Text.StringBuilder infolog);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glGetProgramiv", ExactSpelling = true)]
             internal extern static unsafe void GetProgramiv(UInt32 program, OpenTK.Graphics.ES20.All pname, Int32* @params);
diff --git a/Source/OpenTK/Graphics/ES20/Delegates.cs b/Source/OpenTK/Graphics/ES20/Delegates.cs
index 1fec0ce8..935e895b 100644
--- a/Source/OpenTK/Graphics/ES20/Delegates.cs
+++ b/Source/OpenTK/Graphics/ES20/Delegates.cs
@@ -308,7 +308,7 @@ namespace OpenTK.Graphics.ES20
             internal unsafe delegate void GetProgramBinaryOES(UInt32 program, Int32 bufSize, Int32* length, OpenTK.Graphics.ES20.All* binaryFormat, IntPtr binary);
             internal unsafe static GetProgramBinaryOES glGetProgramBinaryOES;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void GetProgramInfoLog(UInt32 program, Int32 bufsize, Int32* length, String infolog);
+            internal unsafe delegate void GetProgramInfoLog(UInt32 program, Int32 bufsize, Int32* length, [OutAttribute] System.Text.StringBuilder infolog);
             internal unsafe static GetProgramInfoLog glGetProgramInfoLog;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetProgramiv(UInt32 program, OpenTK.Graphics.ES20.All pname, Int32* @params);
diff --git a/Source/OpenTK/Graphics/ES20/ES.cs b/Source/OpenTK/Graphics/ES20/ES.cs
index c349d098..8b8c9271 100644
--- a/Source/OpenTK/Graphics/ES20/ES.cs
+++ b/Source/OpenTK/Graphics/ES20/ES.cs
@@ -6827,13 +6827,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramInfoLog")]
         public static 
-        unsafe void GetProgramInfoLog(Int32 program, Int32 bufsize, Int32* length, String infolog)
+        unsafe void GetProgramInfoLog(Int32 program, Int32 bufsize, Int32* length, [OutAttribute] System.Text.StringBuilder infolog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length, (String)infolog);
+            Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length, (System.Text.StringBuilder)infolog);
             #if DEBUG
             }
             #endif
@@ -6865,7 +6865,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramInfoLog")]
         public static 
-        void GetProgramInfoLog(Int32 program, Int32 bufsize, Int32[] length, String infolog)
+        void GetProgramInfoLog(Int32 program, Int32 bufsize, Int32[] length, [OutAttribute] System.Text.StringBuilder infolog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -6875,7 +6875,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* length_ptr = length)
                 {
-                    Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length_ptr, (String)infolog);
+                    Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length_ptr, (System.Text.StringBuilder)infolog);
                 }
             }
             #if DEBUG
@@ -6909,7 +6909,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramInfoLog")]
         public static 
-        void GetProgramInfoLog(Int32 program, Int32 bufsize, ref Int32 length, String infolog)
+        void GetProgramInfoLog(Int32 program, Int32 bufsize, ref Int32 length, [OutAttribute] System.Text.StringBuilder infolog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -6919,7 +6919,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* length_ptr = &length)
                 {
-                    Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length_ptr, (String)infolog);
+                    Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length_ptr, (System.Text.StringBuilder)infolog);
                 }
             }
             #if DEBUG
@@ -6954,13 +6954,13 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramInfoLog")]
         public static 
-        unsafe void GetProgramInfoLog(UInt32 program, Int32 bufsize, Int32* length, String infolog)
+        unsafe void GetProgramInfoLog(UInt32 program, Int32 bufsize, Int32* length, [OutAttribute] System.Text.StringBuilder infolog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length, (String)infolog);
+            Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length, (System.Text.StringBuilder)infolog);
             #if DEBUG
             }
             #endif
@@ -6993,7 +6993,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramInfoLog")]
         public static 
-        void GetProgramInfoLog(UInt32 program, Int32 bufsize, Int32[] length, String infolog)
+        void GetProgramInfoLog(UInt32 program, Int32 bufsize, Int32[] length, [OutAttribute] System.Text.StringBuilder infolog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -7003,7 +7003,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* length_ptr = length)
                 {
-                    Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length_ptr, (String)infolog);
+                    Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length_ptr, (System.Text.StringBuilder)infolog);
                 }
             }
             #if DEBUG
@@ -7038,7 +7038,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramInfoLog")]
         public static 
-        void GetProgramInfoLog(UInt32 program, Int32 bufsize, ref Int32 length, String infolog)
+        void GetProgramInfoLog(UInt32 program, Int32 bufsize, ref Int32 length, [OutAttribute] System.Text.StringBuilder infolog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -7048,7 +7048,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* length_ptr = &length)
                 {
-                    Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length_ptr, (String)infolog);
+                    Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length_ptr, (System.Text.StringBuilder)infolog);
                 }
             }
             #if DEBUG