diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88c4a2bbf9..01791eeb72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,8 +11,8 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [Fabio Pelosin](https://github.com/irrationalfab)
   [#1185](https://github.com/CocoaPods/CocoaPods/pull/1185)
 
-* Non integrating installations now set the architecture of the Pod targets to
-  the `$(ARCHS_STANDARD)` value.  
+* Non integrating installations for OS X targets now set the architecture of
+* the Pod targets to `$(ARCHS_STANDARD_64_BIT)`.  
   [Fabio Pelosin](https://github.com/irrationalfab)
   [#1185](https://github.com/CocoaPods/CocoaPods/pull/1185)
 
diff --git a/lib/cocoapods/installer/analyzer.rb b/lib/cocoapods/installer/analyzer.rb
index 2d71aa0293..a803c8cbbc 100644
--- a/lib/cocoapods/installer/analyzer.rb
+++ b/lib/cocoapods/installer/analyzer.rb
@@ -182,7 +182,9 @@ def generate_targets
             target.client_root = config.installation_root
             target.user_target_uuids = []
             target.user_build_configurations = {}
-            target.archs = '$(ARCHS_STANDARD)'
+            if target_definition.platform.name == :osx
+              target.archs = '$(ARCHS_STANDARD_64_BIT)'
+            end
           end
 
           grouped_specs = specs.map do |spec|
diff --git a/lib/cocoapods/installer/target_installer.rb b/lib/cocoapods/installer/target_installer.rb
index 019d30f187..b71797b40f 100644
--- a/lib/cocoapods/installer/target_installer.rb
+++ b/lib/cocoapods/installer/target_installer.rb
@@ -45,7 +45,7 @@ def add_target
 
         settings = {}
         if library.archs
-        settings['ARCHS'] = library.archs
+          settings['ARCHS'] = library.archs
         else
           settings.delete('ARCHS')
         end