diff --git a/CMakeLists.txt b/CMakeLists.txt
index d343870aa..645526f39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,8 +212,9 @@ IF(APPLE)
         FIND_LIBRARY(CARBON_LIBRARY Carbon)
         FIND_LIBRARY(COCOA_LIBRARY Cocoa)
 
-        # Apple OS X: Find OpenGL
+        # Apple OS X: Find OpenGL and AGL
         FIND_PACKAGE(OpenGL)
+        FIND_LIBRARY(AGL_LIBRARY AGL)
     ENDIF ()
 
     OPTION(OSG_COMPILE_FRAMEWORKS "compile frameworks instead of dylibs (experimental)" OFF)
diff --git a/src/osgViewer/CMakeLists.txt b/src/osgViewer/CMakeLists.txt
index 1c70e41e8..f1ba894ac 100644
--- a/src/osgViewer/CMakeLists.txt
+++ b/src/osgViewer/CMakeLists.txt
@@ -134,8 +134,7 @@ ELSE()
             PixelBufferCarbon.cpp
         )
 
-        SET(LIB_EXTRA_LIBS ${COCOA_LIBRARY} ${LIB_EXTRA_LIBS})
-        SET(LIB_EXTRA_LIBS ${LIB_EXTRA_LIBS} "-framework AGL")
+        SET(LIB_EXTRA_LIBS ${COCOA_LIBRARY} ${AGL_LIBRARY} ${LIB_EXTRA_LIBS})
 
     ELSEIF(${OSG_WINDOWING_SYSTEM} STREQUAL "IOS")