diff --git a/CMakeLists.txt b/CMakeLists.txt
index 336b79ed4..f81718bc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,12 @@ sfml_set_option(SFML_BUILD_EXAMPLES FALSE BOOL "TRUE to build the SFML examples,
 # add an option for building the API documentation
 sfml_set_option(SFML_BUILD_DOC FALSE BOOL "TRUE to generate the API documentation, FALSE to ignore it")
 
+# set default CMAKE_OSX_ARCHITECTURES value to x86_64
+sfml_set_option(CMAKE_OSX_ARCHITECTURES "x86_64" STRING "Build architectures for OS X")
+
+# set default CMAKE_OSX_DEPLOYMENT_TARGET value to 10.7
+sfml_set_option(CMAKE_OSX_DEPLOYMENT_TARGET "10.7" STRING "Minimum OS version to target for deployment (at runtime)")
+
 # Mac OS X specific options
 if(SFML_OS_MACOSX)
     # add an option to build frameworks instead of dylibs (release only)
@@ -107,6 +113,12 @@ if(SFML_OS_MACOSX)
         message(FATAL_ERROR "CMAKE_OSX_ARCHITECTURES should be 'x86_64' to support ARC")
         return()
     endif()
+
+    # make sure CMAKE_OSX_DEPLOYMENT_TARGET is >= 10.7
+    if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS "10.7")
+        message(FATAL_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET (${CMAKE_OSX_DEPLOYMENT_TARGET}) should be 10.7 or better")
+        return()
+    endif()
 endif()
 
 if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
@@ -118,8 +130,8 @@ if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
                     "tools/pkg-config/sfml-${sfml_module}.pc.in"
                     "tools/pkg-config/sfml-${sfml_module}.pc"
                     @ONLY)
-	    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc"
-                    DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
+                INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc"
+                        DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
             endforeach()
         endif()
     else()
@@ -180,8 +192,8 @@ else()
                        POST_BUILD
                        COMMAND cp -r ${PROJECT_SOURCE_DIR}/include/SFML/* SFML.framework/Versions/${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/Headers)
 
-    # adapt install directory to allow distributing dylibs/frameworks in user’s frameworks/application bundle
-    # NOTE : it's not required to link agains SFML.framework
+    # adapt install directory to allow distributing dylibs/frameworks in user's frameworks/application bundle
+    # NOTE : it's not required to link against SFML.framework
     set_target_properties(SFML PROPERTIES
                           BUILD_WITH_INSTALL_RPATH 1
                           INSTALL_NAME_DIR "@executable_path/../Frameworks")
@@ -218,6 +230,12 @@ elseif(SFML_OS_MACOSX)
     install(DIRECTORY extlibs/libs-osx/Frameworks/freetype.framework DESTINATION ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
 
     if(SFML_INSTALL_XCODE4_TEMPLATES)
-        install(DIRECTORY tools/xcode/templates/SFML DESTINATION /Library/Developer/Xcode/Templates)
+        install(DIRECTORY tools/xcode/templates/SFML
+                DESTINATION /Library/Developer/Xcode/Templates
+                PATTERN "*.in" EXCLUDE)
+        configure_file(
+                    "tools/xcode/templates/SFML/SFML Compiler.xctemplate/TemplateInfo.plist.in"
+                    "/Library/Developer/Xcode/Templates/SFML/SFML Compiler.xctemplate/TemplateInfo.plist"
+                    @ONLY)
     endif()
 endif()
diff --git a/cmake/Config.cmake b/cmake/Config.cmake
index de6efde9d..cb5e72ba8 100644
--- a/cmake/Config.cmake
+++ b/cmake/Config.cmake
@@ -24,7 +24,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     EXEC_PROGRAM(/usr/bin/sw_vers ARGS -productVersion OUTPUT_VARIABLE MACOSX_VERSION_RAW)
     STRING(REGEX REPLACE "10\\.([0-9]).*" "\\1" MACOSX_VERSION "${MACOSX_VERSION_RAW}")
     if(${MACOSX_VERSION} LESS 7)
-        message(FATAL_ERROR "Unsupported version of OS X : ${MACOSX_VERSION_RAW}")
+        message(FATAL_ERROR "Unsupported version of OS X: ${MACOSX_VERSION_RAW}")
         return()
     endif()
 else()
diff --git a/tools/xcode/templates/SFML/SFML Compiler.xctemplate/TemplateInfo.plist b/tools/xcode/templates/SFML/SFML Compiler.xctemplate/TemplateInfo.plist.in
similarity index 56%
rename from tools/xcode/templates/SFML/SFML Compiler.xctemplate/TemplateInfo.plist
rename to tools/xcode/templates/SFML/SFML Compiler.xctemplate/TemplateInfo.plist.in
index dc667c625..30782842f 100644
--- a/tools/xcode/templates/SFML/SFML Compiler.xctemplate/TemplateInfo.plist	
+++ b/tools/xcode/templates/SFML/SFML Compiler.xctemplate/TemplateInfo.plist.in	
@@ -27,9 +27,10 @@ subject to the following restrictions:
 <!--
      This template defines :
       - the compiler & std lib
-      - the supported arch
+      - the supported arch (only 64 bit)
       - some other target's settings (e.g. warnings flags)
       - the search paths
+      - deployment target (according to CMake build settings)
  -->
 
 <plist version="1.0">
@@ -69,32 +70,6 @@ subject to the following restrictions:
 
                 <key>Units</key>
                 <dict>
-                    <!-- Use GCC and libstdc++ -->
-                    <key>C++98 with GCC and libstdc++ and target 10.5</key>
-                    <dict>
-                        <key>Project</key>
-                        <dict>
-                            <key>SharedSettings</key>
-                            <dict>
-                                <key>GCC_VERSION</key>
-                                <string>com.apple.compilers.llvmgcc42</string>
-
-                                <key>MACOSX_DEPLOYMENT_TARGET</key>
-                                <string>10.5</string>
-                            </dict>
-                        </dict>
-
-                        <key>Targets</key>
-                        <array>
-                            <dict>
-                                <key>Frameworks</key>
-                                <array>
-                                    <string>Foundation</string>
-                                </array>
-                            </dict>
-                        </array>
-                    </dict>
-
                     <!-- Use Clang and libstdc++ -->
                     <key>C++98 with Clang and libstdc++</key>
                     <dict>
@@ -135,67 +110,6 @@ subject to the following restrictions:
                 </dict>
             </dict>
 
-            <dict>
-                <key>Identifier</key>
-                <string>archType</string>
-
-                <key>Name</key>
-                <string>[ADVANCED] Architectures</string>
-
-                <key>Description</key>
-                <string>Choose which architecture(s) you want to support</string>
-
-                <key>Default</key>
-                <string>Universal</string>
-
-                <key>NotPersisted</key>
-                <true />
-
-                <key>Type</key>
-                <string>popup</string>
-
-                <key>Units</key>
-                <dict>
-                    <!-- Support 32 + 64 bits -->
-                    <key>Universal</key>
-                    <dict>
-                        <key>Project</key>
-                        <dict>
-                            <key>SharedSettings</key>
-                            <dict>
-                                <key>ARCHS</key>
-                                <string>$(ARCHS_STANDARD_32_64_BIT)</string>
-                            </dict>
-                        </dict>
-                    </dict>
-
-                    <!-- Support 64 bits -->
-                    <key>64 bits</key>
-                    <dict>
-                        <key>Project</key>
-                        <dict>
-                            <key>SharedSettings</key>
-                            <dict>
-                                <key>ARCHS</key>
-                                <string>$(ARCHS_STANDARD_64_BIT)</string>
-                            </dict>
-                        </dict>
-                    </dict>
-
-                    <!-- Support 32 bits -->
-                    <key>32 bits</key>
-                    <dict>
-                        <key>Project</key>
-                        <dict>
-                            <key>SharedSettings</key>
-                            <dict>
-                                <key>ARCHS</key>
-                                <string>$(ARCHS_STANDARD_32_BIT)</string>
-                            </dict>
-                        </dict>
-                    </dict>
-                </dict>
-            </dict>
         </array>
 
         <!--
@@ -204,23 +118,18 @@ subject to the following restrictions:
         <key>Project</key>
         <dict>
             <key>SharedSettings</key>
-            <dict
+            <dict>
                 <!-- PLATFORM -->
                 <key>SUPPORTED_PLATFORMS</key>
                 <string>macosx</string>
 
-                <!-- WARNINGS -->
-                <!-- TODO add more warnings -->
-                <key>GCC_WARN_ABOUT_RETURN_TYPE</key>
-                <string>YES</string>
-                <key>GCC_WARN_UNINITIALIZED_AUTOS</key>
-                <string>YES</string>
-                <key>GCC_WARN_UNUSED_VARIABLE</key>
-                <string>YES</string>
-                <key>CLANG_WARN__DUPLICATE_METHOD_MATCH</key>
-                <string>YES</string>
-                <key>CLANG_WARN_EMPTY_BODY</key>
-                <string>YES</string>
+                <!-- ARCHITECTURES: only 64 bit -->
+                <key>ARCHS</key>
+                <string>$(ARCHS_STANDARD_64_BIT)</string>
+
+                <!-- DEPLOYMENT -->
+                <key>MACOSX_DEPLOYMENT_TARGET</key>
+                <string>@CMAKE_OSX_DEPLOYMENT_TARGET@</string>
 
                 <!-- SERACH PATHS -->
                 <key>FRAMEWORK_SEARCH_PATHS</key>
@@ -237,25 +146,10 @@ subject to the following restrictions:
             <dict>
                 <key>Debug</key>
                 <dict>
-                    <key>GCC_OPTIMIZATION_LEVEL</key>
-                    <string>0</string>
-
-                    <key>GCC_PREPROCESSOR_DEFINITIONS</key>
-                    <string>DEBUG=1 $(inherited)</string>
-
-                    <!-- ALWAYS compile for all arch. -->
-                    <key>ONLY_ACTIVE_ARCH</key>
-                    <string>NO</string>
                 </dict>
 
                 <key>Release</key>
                 <dict>
-                    <key>COPY_PHASE_STRIP</key>
-                    <string>YES</string>
-
-                    <!-- ALWAYS compile for all arch. -->
-                    <key>ONLY_ACTIVE_ARCH</key>
-                    <string>NO</string>
                 </dict>
             </dict>
         </dict>
diff --git a/tools/xcode/templates/readme.txt b/tools/xcode/templates/readme.txt
index 23f6eee01..2b1564056 100644
--- a/tools/xcode/templates/readme.txt
+++ b/tools/xcode/templates/readme.txt
@@ -38,7 +38,7 @@ Before installing the template, make sure you have installed:
 
  - Xcode 4 or Xcode 5, up to date
  - Installed Xcode's Command Line Tools
- - SFML 2, either as framework or dylibs binaries
+ - SFML 2, either framework or dylib binaries
 
 There is one constraint on the installation of SFML: the frameworks needs to be installed in /Library/Frameworks and the dylibs into /usr/local/lib. You don't need both but make sure they are in the correct folder.
 
@@ -71,8 +71,8 @@ Note : some settings are marked as "[ADVANCED]" in the wizard. If you're not sur
 
 
 
-Question & Answer
------------------
+FAQ
+---
 
   * I want to use Xcode 3. Can I use these templates anyway?