diff --git a/Tools/CMake/libraries/glad.cmake b/Tools/CMake/libraries/glad.cmake
new file mode 100644
index 000000000..7409ae99b
--- /dev/null
+++ b/Tools/CMake/libraries/glad.cmake
@@ -0,0 +1,36 @@
+# -----------------------------------------------------------------------------
+# Copyright (c) 2016 GarageGames, LLC
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+# -----------------------------------------------------------------------------
+
+project(glad)
+
+addPath("${libDir}/glad/src")
+
+# TODO EGL support if we ever use EGL instead of GLX
+if (WIN32)
+   addPath("${libDir}/glad/src/wgl")
+else()
+   addPath("${libDir}/glad/src/glx") 
+endif()
+
+addInclude("${libDir}/glad/include")
+
+finishLibrary()
diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake
index d3727933c..cc4b222b7 100644
--- a/Tools/CMake/torque3d.cmake
+++ b/Tools/CMake/torque3d.cmake
@@ -599,7 +599,7 @@ addLib(collada)
 addLib(pcre)
 addLib(convexDecomp)
 if (TORQUE_OPENGL)
-   addLib(epoxy)
+   addLib(glad)
 endif()
 
 if(WIN32)
@@ -701,8 +701,7 @@ if(TORQUE_SDL)
    addInclude("${libDir}/nativeFileDialogs/include")
 endif()
 if(TORQUE_OPENGL)
-	addInclude("${libDir}/epoxy/include")
-	addInclude("${libDir}/epoxy/src")
+	addInclude("${libDir}/glad/include")
 endif()
 
 if(UNIX)