diff --git a/CMakeLists.txt b/CMakeLists.txt
index b17b42a..a3d31ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,8 +22,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 # All platforms need OpenGL
 #
 
-include(FindPkgConfig)
-pkg_check_modules( OpenGL REQUIRED gl )
+find_package(OpenGL REQUIRED)
 
 #
 # Linux needs X11
@@ -41,25 +40,28 @@ add_library(GLEW_static STATIC src/glew.c )
 add_library(GLEW_shared SHARED src/glew.c )
 set_target_properties(GLEW_static PROPERTIES OUTPUT_NAME ${GLEW_LIB_NAME} PREFIX lib)
 set_target_properties(GLEW_shared PROPERTIES OUTPUT_NAME ${GLEW_LIB_NAME} PREFIX "${DLL_PREFIX}")
-target_link_libraries(GLEW_shared ${OpenGL_LDFLAGS})
+target_link_libraries(GLEW_shared ${OPENGL_gl_LIBRARY})
 
 add_library(GLEW_MX_static STATIC src/glew.c )
 add_library(GLEW_MX_shared SHARED src/glew.c )
 set_target_properties(GLEW_MX_static PROPERTIES OUTPUT_NAME ${GLEW_LIB_NAME}mx COMPILE_FLAGS "-DGLEW_MX" PREFIX lib)
 set_target_properties(GLEW_MX_shared PROPERTIES OUTPUT_NAME ${GLEW_LIB_NAME}mx COMPILE_FLAGS "-DGLEW_MX" PREFIX "${DLL_PREFIX}")
-target_link_libraries(GLEW_MX_shared ${OpenGL_LDFLAGS})
+target_link_libraries(GLEW_MX_shared ${OPENGL_gl_LIBRARY})
 
 add_executable(glewinfo src/glewinfo.c)
-target_link_libraries(glewinfo GLEW_shared ${OpenGL_LDFLAGS})
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    target_link_libraries(glewinfo ${X11_LIBRARIES})
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+target_link_libraries(glewinfo GLEW_shared ${OPENGL_gl_LIBRARY})
 
 add_executable(visualinfo src/visualinfo.c)
-target_link_libraries(visualinfo GLEW_shared ${OpenGL_LDFLAGS})
+target_link_libraries(visualinfo GLEW_shared ${OPENGL_gl_LIBRARY})
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	# cmake finds AGL framework as a glu framework on OS X
+	target_link_libraries(glewinfo ${OPENGL_glu_LIBRARY})
+    target_link_libraries(visualinfo ${OPENGL_glu_LIBRARY})
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	target_link_libraries(glewinfo ${X11_LIBRARIES})
     target_link_libraries(visualinfo ${X11_LIBRARIES})
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")