diff --git a/CMake/Packages/FindOpenGLES.cmake b/CMake/Packages/FindOpenGLES.cmake
index 535cdb15a..ac3e943e2 100644
--- a/CMake/Packages/FindOpenGLES.cmake
+++ b/CMake/Packages/FindOpenGLES.cmake
@@ -42,21 +42,33 @@ ELSE (WIN32)
 
   ELSE(APPLE)
 
-    FIND_PATH(OPENGLES_INCLUDE_DIR GLES/gl.h
-      /usr/openwin/share/include
-      /opt/graphics/OpenGL/include /usr/X11R6/include
-      /usr/include
-      /opt/vc/include
-    )
+    IF (DEFINED BCMHOST)
+      FIND_PATH(OPENGLES_INCLUDE_DIR GLES/gl.h
+        /opt/vc/include
+        NO_DEFAULT_PATH
+      )
 
-    FIND_LIBRARY(OPENGLES_gl_LIBRARY
-      NAMES GLES_CM GLESv1_CM
-      PATHS /opt/graphics/OpenGL/lib
-            /usr/openwin/lib
-            /usr/shlib /usr/X11R6/lib
-            /usr/lib
-            /opt/vc/lib
-    )
+      FIND_LIBRARY(OPENGLES_gl_LIBRARY
+        NAMES brcmGLESv2
+        PATHS /opt/vc/lib
+      )
+
+    ELSE (DEFINED BCMHOST)
+
+      FIND_PATH(OPENGLES_INCLUDE_DIR GLES/gl.h
+        /usr/openwin/share/include
+        /opt/graphics/OpenGL/include /usr/X11R6/include
+        /usr/include
+      )
+
+      FIND_LIBRARY(OPENGLES_gl_LIBRARY
+        NAMES GLES_CM GLESv1_CM
+        PATHS /opt/graphics/OpenGL/lib
+              /usr/openwin/lib
+              /usr/shlib /usr/X11R6/lib
+              /usr/lib
+      )
+    ENDIF (DEFINED BCMHOST)
 
     # On Unix OpenGL most certainly always requires X11.
     # Feel free to tighten up these conditions if you don't 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0b8f75bc..8865c9663 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,7 +178,7 @@ endif()
 if(DEFINED BCMHOST)
     LIST(APPEND COMMON_LIBRARIES
         bcm_host
-        EGL
+        brcmEGL
         ${OPENGLES_LIBRARIES}
     )
 else()