diff --git a/tools/xcode/templates/SFML/SFML Application Base.xctemplate/TemplateInfo.plist b/tools/xcode/templates/SFML/SFML Application Base.xctemplate/TemplateInfo.plist
index 79406963c..1314e5ebc 100644
--- a/tools/xcode/templates/SFML/SFML Application Base.xctemplate/TemplateInfo.plist	
+++ b/tools/xcode/templates/SFML/SFML Application Base.xctemplate/TemplateInfo.plist	
@@ -66,14 +66,8 @@ subject to the following restrictions:
                     <dict>
                         <key>SharedSettings</key>
                         <dict>
-                            <key>SFML_LINK_PREFIX</key>
-                            <string>$(SFML_LINK_FRAMEWORKS_PREFIX)</string>
-                            
-                            <key>SFML_LINK_SUFFIX</key>
-                            <string>$(SFML_LINK_FRAMEWORKS_SUFFIX)</string>
-            
-                            <key>HEADER_SEARCH_PATHS</key>
-                            <string>$(HEADER_SEARCH_PATHS)</string>
+                            <key>SFML_BINARY_TYPE</key>
+                            <string>FRAMEWORKS</string>
                         </dict>
                     </dict>
                 </dict>
@@ -85,14 +79,8 @@ subject to the following restrictions:
                     <dict>
                         <key>SharedSettings</key>
                         <dict>
-                            <key>SFML_LINK_PREFIX</key>
-                            <string>$(SFML_LINK_DYLIBS_PREFIX)</string>
-                            
-                            <key>SFML_LINK_SUFFIX</key>
-                            <string>$(SFML_LINK_DYLIBS_SUFFIX)</string>
-            
-                            <key>HEADER_SEARCH_PATHS</key>
-                            <string>$(HEADER_SEARCH_PATHS) /usr/local/include/</string>
+                            <key>SFML_BINARY_TYPE</key>
+                            <string>DYLIBS</string>
                         </dict>
                     </dict>
                 </dict>
@@ -558,7 +546,7 @@ music.play();
         <string>main.cpp:main:graphics_display</string>
         <string>main.cpp:main:display</string>
         <string>ResourcePath.mm</string>
-           <string>ResourcePath.hpp</string>
+        <string>ResourcePath.hpp</string>
     </array>
     
             
@@ -652,11 +640,17 @@ while (window.isOpen())
             <key>SFML_LINK_FRAMEWORKS_PREFIX</key>
             <string>-framework </string>
             
-               <key>SFML_SYSTEM</key>
+            <key>SFML_SYSTEM</key>
             <string>$(SFML_LINK_PREFIX)sfml-system$(SFML_LINK_SUFFIX)</string>
             
             <key>SFML_LINK_FRAMEWORKS_SUFFIX</key>
             <string></string>
+                            
+            <key>SFML_LINK_PREFIX</key>
+            <string>$(SFML_LINK_$(SFML_BINARY_TYPE)_PREFIX)</string>
+            
+            <key>SFML_LINK_SUFFIX</key>
+            <string>$(SFML_LINK_$(SFML_BINARY_TYPE)_SUFFIX)</string>
             
             <key>CLANG_ENABLE_OBJC_ARC</key>
             <string></string>
diff --git a/tools/xcode/templates/SFML/SFML Command Line Tool Base.xctemplate/TemplateInfo.plist b/tools/xcode/templates/SFML/SFML Command Line Tool Base.xctemplate/TemplateInfo.plist
index 0e0a402de..bd475d26c 100644
--- a/tools/xcode/templates/SFML/SFML Command Line Tool Base.xctemplate/TemplateInfo.plist	
+++ b/tools/xcode/templates/SFML/SFML Command Line Tool Base.xctemplate/TemplateInfo.plist	
@@ -66,14 +66,8 @@ subject to the following restrictions:
                     <dict>
                         <key>SharedSettings</key>
                         <dict>
-                            <key>SFML_LINK_PREFIX</key>
-                            <string>$(SFML_LINK_FRAMEWORKS_PREFIX)</string>
-                            
-                            <key>SFML_LINK_SUFFIX</key>
-                            <string>$(SFML_LINK_FRAMEWORKS_SUFFIX)</string>
-            
-                            <key>HEADER_SEARCH_PATHS</key>
-                            <string>$(HEADER_SEARCH_PATHS)</string>
+                            <key>SFML_BINARY_TYPE</key>
+                            <string>FRAMEWORKS</string>
                         </dict>
                     </dict>
                 </dict>
@@ -85,14 +79,8 @@ subject to the following restrictions:
                     <dict>
                         <key>SharedSettings</key>
                         <dict>
-                            <key>SFML_LINK_PREFIX</key>
-                            <string>$(SFML_LINK_DYLIBS_PREFIX)</string>
-                            
-                            <key>SFML_LINK_SUFFIX</key>
-                            <string>$(SFML_LINK_DYLIBS_SUFFIX)</string>
-            
-                            <key>HEADER_SEARCH_PATHS</key>
-                            <string>$(HEADER_SEARCH_PATHS) /usr/local/include/</string>
+                            <key>SFML_BINARY_TYPE</key>
+                            <string>DYLIBS</string>
                         </dict>
                     </dict>
                 </dict>
@@ -654,6 +642,12 @@ while (window.isOpen())
             
             <key>SFML_LINK_FRAMEWORKS_SUFFIX</key>
             <string></string>
+                            
+            <key>SFML_LINK_PREFIX</key>
+            <string>$(SFML_LINK_$(SFML_BINARY_TYPE)_PREFIX)</string>
+            
+            <key>SFML_LINK_SUFFIX</key>
+            <string>$(SFML_LINK_$(SFML_BINARY_TYPE)_SUFFIX)</string>
             
             <key>CLANG_ENABLE_OBJC_ARC</key>
             <string></string>
diff --git a/tools/xcode/templates/readme.txt b/tools/xcode/templates/readme.txt
index ee41b9d68..6270e8aff 100644
--- a/tools/xcode/templates/readme.txt
+++ b/tools/xcode/templates/readme.txt
@@ -47,13 +47,18 @@ Question & Answer
     2. select your project's target on the main area,
     3. go to the "Build Settings" tab,
     4. go down to the bottom,
-    5. update SFML_LINK_PREFIX and SFML_LINK_SUFFIX as follow :
-      * if you want to use frameworks, then
-        1. set SFML_LINK_PREFIX to "$(SFML_LINK_FRAMEWORKS_PREFIX)",
-        2. set SFML_LINK_SUFFIX to "$(SFML_LINK_FRAMEWORKS_SUFFIX)"
-      * if you want to use dylibs, then
-        1. set SFML_LINK_PREFIX to "$(SFML_LINK_DYLIBS_PREFIX)",
-        2. set SFML_LINK_SUFFIX to "$(SFML_LINK_DYLIBS_SUFFIX)"
+    5. set SFML_BINARY_TYPE either to "DYLIBS" or "FRAMEWORKS".
+
+
+  * How to use/don't use debug dylibs ?
+
+    You can choose to use or not SFML debug binaries when creating a new project. However, if you have already created your project you can do the following :
+
+    1. select your project from the project navigator panel,
+    2. select your project's target on the main area,
+    3. go to the "Build Settings" tab,
+    4. go down to the bottom,
+    5. set SFML_LINK_DYLIBS_SUFFIX_DEBUG to "-d" to use them or to "" (empty string) to use only release binary.
 
 
   * I want to use the static version of SFML. Is it possible ?