diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cbdeff4..3c28f70d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,10 +115,17 @@ if (UNIX AND APPLE)
     # Define the platform identifier
     set(_GLFW_COCOA_NSGL 1)
 
+    option(GLFW_BUILD_UNIVERSAL "Build the GLFW library and examples as Universal Binaries" FALSE)
+
     # Universal build, decent set of warning flags...
-    set(CMAKE_OSX_ARCHITECTURES ppc;i386;ppc64;x86_64)
-    set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
-    set(CMAKE_C_FLAGS "-mmacosx-version-min=10.5 -Wall -Wextra -Wno-unused-parameter -Werror") 
+    if (GLFW_BUILD_UNIVERSAL)
+        message(STATUS "Building GLFW as Universal Binaries")
+        set(CMAKE_OSX_ARCHITECTURES ppc;i386;ppc64;x86_64)
+        set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
+        set(CMAKE_C_FLAGS "-mmacosx-version-min=10.5 -Wall -Wextra -Wno-unused-parameter -Werror") 
+    else(GLFW_BUILD_UNIVERSAL)
+        message(STATUS "Building GLFW only for the native architecture")
+    endif(GLFW_BUILD_UNIVERSAL)
     
     # Set up library and include paths
     find_library(COCOA_FRAMEWORK Cocoa)
diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index d28802f7..6b3077dd 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -1,4 +1,4 @@
-/************************************************************************
+/*************************************************************************
  * GLFW - An OpenGL framework
  * API version: 3.0
  * WWW:         http://www.glfw.org/
@@ -127,15 +127,15 @@ extern "C" {
 #if defined(_WIN32) && defined(GLFW_BUILD_DLL)
 
  /* We are building a Win32 DLL */
- #define GLFWAPI      __declspec(dllexport)
+ #define GLFWAPI __declspec(dllexport)
 
 #elif defined(_WIN32) && defined(GLFW_DLL)
 
  /* We are calling a Win32 DLL */
  #if defined(__LCC__)
-  #define GLFWAPI      extern
+  #define GLFWAPI extern
  #else
-  #define GLFWAPI      __declspec(dllimport)
+  #define GLFWAPI __declspec(dllimport)
  #endif
 
 #else