diff --git a/.travis.yml b/.travis.yml
index b851c3a8526bda..88ad3aaf14a5a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,4 +2,7 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
+branches:
+  only:
+    - master
 install: rake travis:setup
diff --git a/AFNetworking/0.5.1/AFNetworking.podspec b/AFNetworking/0.5.1/AFNetworking.podspec
index f9d3adbee4e10c..e0c6005acb1a6a 100644
--- a/AFNetworking/0.5.1/AFNetworking.podspec
+++ b/AFNetworking/0.5.1/AFNetworking.podspec
@@ -6,17 +6,16 @@ Pod::Spec.new do |s|
   s.author   = { 'Gowalla' => 'live@gowalla.com' }
   s.source   = { :git => 'https://github.com/gowalla/AFNetworking.git', :tag => '0.5.1' }
 
-  if config.ios?
-    s.source_files = 'AFNetworking' # everything
-  else
-    s.source_files = %w{
-      AFNetworking/AFHTTPRequestOperation.h
-      AFNetworking/AFJSONRequestOperation.h
-      AFNetworking/NSData+AFNetworking.h
-      AFNetworking/NSMutableURLRequest+AFNetworking.h
-      AFNetworking/NSString+AFNetworking.h
-    }
-  end
+  # Everything on iOS
+  s.ios.source_files = 'AFNetworking'
+
+  s.osx.source_files = %w{
+    AFNetworking/AFHTTPRequestOperation.h
+    AFNetworking/AFJSONRequestOperation.h
+    AFNetworking/NSData+AFNetworking.h
+    AFNetworking/NSMutableURLRequest+AFNetworking.h
+    AFNetworking/NSString+AFNetworking.h
+  }
 
   s.library = 'z'
   s.dependency 'JSONKit'
diff --git a/ASIHTTPRequest/1.8.1/ASIHTTPRequest.podspec b/ASIHTTPRequest/1.8.1/ASIHTTPRequest.podspec
index a03132278ac9e1..7edd7f681219fd 100644
--- a/ASIHTTPRequest/1.8.1/ASIHTTPRequest.podspec
+++ b/ASIHTTPRequest/1.8.1/ASIHTTPRequest.podspec
@@ -20,14 +20,12 @@ Pod::Spec.new do |s|
 
   s.clean_paths = '*Sample', 'External', '*.xcodeproj', 'Build Scripts'
 
-  if config.ios?
-    s.dependency 'Reachability' #, '~> 2.0', '>= 2.0.4'
-    s.source_files = 'Classes'
-    s.frameworks   = 'MobileCoreServices', 'CFNetwork', 'CoreGraphics'
-  else
-    s.source_files = FileList['Classes/*.*'].exclude(/ASIAuthenticationDialog\.\w$/)
-    s.frameworks   = 'SystemConfiguration', 'CoreServices'
-  end
+  s.ios.dependency 'Reachability' #, '~> 2.0', '>= 2.0.4'
+  s.ios.source_files = 'Classes'
+  s.ios.frameworks   = 'MobileCoreServices', 'CFNetwork', 'CoreGraphics'
+
+  s.osx.source_files = FileList['Classes/*.*'].exclude(/ASIAuthenticationDialog\.\w$/)
+  s.osx.frameworks   = 'SystemConfiguration', 'CoreServices'
 
   s.library    = 'z.1'
 end
diff --git a/AdMob/6.0.1/AdMob.podspec b/AdMob/6.0.1/AdMob.podspec
new file mode 100644
index 00000000000000..36752f6b5d92a0
--- /dev/null
+++ b/AdMob/6.0.1/AdMob.podspec
@@ -0,0 +1,19 @@
+Pod::Spec.new do |s|
+  s.name     = 'AdMob'
+  s.version  = '6.0.1'
+  s.license  = 'Commercial'
+  s.summary  = 'The Google AdMob Ads SDK.'
+  s.homepage = 'https://developers.google.com/mobile-ads-sdk/download'
+  s.author   = 'Google'
+  s.source   = { :http => 'http://dl.google.com/googleadmobadssdk/googleadmobadssdkios.zip' }
+  s.description = %{
+    The Google AdMob Ads SDK is the next generation in Google mobile advertising featuring refined ad formats and streamlined APIs for access to Google's AdMob and DoubleClick For Publishers (upgraded DFP) [Android and iOS only] mobile advertising solutions.
+  }
+
+  s.platform        = :ios
+  s.source_files    = '**/*.h'
+  s.library         = 'GoogleAdMobAds'
+  s.frameworks      = 'AudioToolbox', 'MessageUI', 'SystemConfiguration', 'CoreGraphics'
+  s.xcconfig        =  { 'LIBRARY_SEARCH_PATHS' => "$(SRCROOT)/Pods/AdMob/GoogleAdMobAdsSdkiOS-6.0.1" }
+
+end
diff --git a/BlocksKit/0.5.0/BlocksKit.podspec b/BlocksKit/0.5.0/BlocksKit.podspec
index f24ddc854ea067..390bd72b550432 100644
--- a/BlocksKit/0.5.0/BlocksKit.podspec
+++ b/BlocksKit/0.5.0/BlocksKit.podspec
@@ -7,17 +7,11 @@ Pod::Spec.new do |s|
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :commit => '84b12bd081c71b17e56c133002eee8f8577e9a24' }
 
   s.source_files = 'BlocksKit'
+  s.prefix_header_file = 'BlocksKit/BlocksKit-Prefix.pch'
 
   s.frameworks = 'MessageUI'
 
   s.requires_arc = true
 
   s.clean_paths = 'BlocksKit.xcodeproj/', 'GHUnitIOS.framework/', 'Tests/', '.gitignore'
-
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import <dispatch/dispatch.h>\n#import "BKGlobals.h"\n#endif})
-    end
-  end
 end
diff --git a/BlocksKit/0.9.0/BlocksKit.podspec b/BlocksKit/0.9.0/BlocksKit.podspec
index 576dc3d807b6b5..2f36a08e9666d8 100644
--- a/BlocksKit/0.9.0/BlocksKit.podspec
+++ b/BlocksKit/0.9.0/BlocksKit.podspec
@@ -7,17 +7,11 @@ Pod::Spec.new do |s|
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v0.9' }
 
   s.source_files = 'BlocksKit'
+  s.prefix_header_file = 'BlocksKit/BlocksKit-Prefix.pch'
 
   s.frameworks = 'MessageUI'
 
   s.requires_arc = true
 
   s.clean_paths = 'BlocksKit.xcodeproj/', 'GHUnitIOS.framework/', 'Tests/', '.gitignore'
-
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import <dispatch/dispatch.h>\n#import "BKGlobals.h"\n#endif})
-    end
-  end
 end
diff --git a/BlocksKit/0.9.5/BlocksKit.podspec b/BlocksKit/0.9.5/BlocksKit.podspec
index 4819229056a21c..40b7cfb2e231d0 100644
--- a/BlocksKit/0.9.5/BlocksKit.podspec
+++ b/BlocksKit/0.9.5/BlocksKit.podspec
@@ -7,17 +7,11 @@ Pod::Spec.new do |s|
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v0.9.5' }
 
   s.source_files = 'BlocksKit'
+  s.prefix_header_file = 'BlocksKit/BlocksKit-Prefix.pch'
 
   s.frameworks = 'MessageUI'
 
   s.requires_arc = true
 
   s.clean_paths = 'BlocksKit.xcodeproj/', 'GHUnitIOS.framework/', 'Tests/', '.gitignore'
-
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import <dispatch/dispatch.h>\n#import "BlocksKit.h"\n#endif})
-    end
-  end
 end
diff --git a/BlocksKit/1.0.0/BlocksKit.podspec b/BlocksKit/1.0.0/BlocksKit.podspec
index 2a2856fcc004fb..97f08c8bbcc162 100644
--- a/BlocksKit/1.0.0/BlocksKit.podspec
+++ b/BlocksKit/1.0.0/BlocksKit.podspec
@@ -8,15 +8,8 @@ Pod::Spec.new do |s|
                  'Alexsander Akers' => 'a2@pandamonia.us' }
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.0' }
   s.source_files = 'BlocksKit'
+  s.prefix_header_contents = '#import "BlocksKit.h"'
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks = 'MessageUI'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+  s.ios.frameworks = 'MessageUI'
 end
diff --git a/BlocksKit/1.0.1/BlocksKit.podspec b/BlocksKit/1.0.1/BlocksKit.podspec
index 9c909abe47a52f..8c6f6b319c3403 100644
--- a/BlocksKit/1.0.1/BlocksKit.podspec
+++ b/BlocksKit/1.0.1/BlocksKit.podspec
@@ -8,15 +8,8 @@ Pod::Spec.new do |s|
                  'Alexsander Akers' => 'a2@pandamonia.us' }
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.1' }
   s.source_files = 'BlocksKit'
+  s.prefix_header_contents = '#import "BlocksKit.h"'
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks = 'MessageUI'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+  s.ios.frameworks = 'MessageUI'
 end
diff --git a/BlocksKit/1.0.2/BlocksKit.podspec b/BlocksKit/1.0.2/BlocksKit.podspec
index 3923afd6741698..616af8277b3371 100644
--- a/BlocksKit/1.0.2/BlocksKit.podspec
+++ b/BlocksKit/1.0.2/BlocksKit.podspec
@@ -8,15 +8,8 @@ Pod::Spec.new do |s|
                  'Alexsander Akers' => 'a2@pandamonia.us' }
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.2' }
   s.source_files = 'BlocksKit'
+  s.prefix_header_contents = '#import "BlocksKit.h"'
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks = 'MessageUI'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+  s.ios.frameworks = 'MessageUI'
 end
diff --git a/BlocksKit/1.0.3/BlocksKit.podspec b/BlocksKit/1.0.3/BlocksKit.podspec
index b425af02c215d6..b2ac6180082da8 100644
--- a/BlocksKit/1.0.3/BlocksKit.podspec
+++ b/BlocksKit/1.0.3/BlocksKit.podspec
@@ -8,15 +8,8 @@ Pod::Spec.new do |s|
                  'Alexsander Akers' => 'a2@pandamonia.us' }
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.3' }
   s.source_files = 'BlocksKit'
+  s.prefix_header_contents = '#import "BlocksKit.h"'
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks = 'MessageUI'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+  s.ios.frameworks = 'MessageUI'
 end
diff --git a/BlocksKit/1.0.4/BlocksKit.podspec b/BlocksKit/1.0.4/BlocksKit.podspec
index 99f35165031dd8..7c7022e4eadeaa 100644
--- a/BlocksKit/1.0.4/BlocksKit.podspec
+++ b/BlocksKit/1.0.4/BlocksKit.podspec
@@ -8,15 +8,8 @@ Pod::Spec.new do |s|
                  'Alexsander Akers' => 'a2@pandamonia.us' }
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.4' }
   s.source_files = 'BlocksKit'
+  s.prefix_header_contents = '#import "BlocksKit.h"'
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks = 'MessageUI'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+  s.ios.frameworks = 'MessageUI'
 end
diff --git a/BlocksKit/1.0.5/BlocksKit.podspec b/BlocksKit/1.0.5/BlocksKit.podspec
index 2c47e418d2c1ae..aa462751dd974f 100644
--- a/BlocksKit/1.0.5/BlocksKit.podspec
+++ b/BlocksKit/1.0.5/BlocksKit.podspec
@@ -8,15 +8,8 @@ Pod::Spec.new do |s|
                  'Alexsander Akers' => 'a2@pandamonia.us' }
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.5' }
   s.source_files = 'BlocksKit'
+  s.prefix_header_contents = '#import "BlocksKit.h"'
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks = 'MessageUI'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+  s.ios.frameworks = 'MessageUI'
 end
diff --git a/BlocksKit/1.0.6/BlocksKit.podspec b/BlocksKit/1.0.6/BlocksKit.podspec
index 234890dd9b52d5..530d8f732139a4 100644
--- a/BlocksKit/1.0.6/BlocksKit.podspec
+++ b/BlocksKit/1.0.6/BlocksKit.podspec
@@ -9,16 +9,11 @@ Pod::Spec.new do |s|
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.6' }
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks   = 'MessageUI'
-    s.source_files = 'BlocksKit/*.{h,m}', 'BlocksKit/UIKit/*.{h,m}', 'BlocksKit/MessageUI/*.{h,m}'
-  else
-    s.source_files = 'BlocksKit/*.{h,m}'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+
+  s.prefix_header_contents = '#import "BlocksKit.h"'
+
+  s.ios.frameworks   = 'MessageUI'
+  s.ios.source_files = 'BlocksKit/*.{h,m}', 'BlocksKit/UIKit/*.{h,m}', 'BlocksKit/MessageUI/*.{h,m}'
+
+  s.osx.source_files = 'BlocksKit/*.{h,m}'
 end
diff --git a/CocoaAsyncSocket/0.0.1/CocoaAsyncSocket.podspec b/CocoaAsyncSocket/0.0.1/CocoaAsyncSocket.podspec
index 2d4548a8127a48..500b8784dd7665 100644
--- a/CocoaAsyncSocket/0.0.1/CocoaAsyncSocket.podspec
+++ b/CocoaAsyncSocket/0.0.1/CocoaAsyncSocket.podspec
@@ -19,9 +19,6 @@ Pod::Spec.new do |s|
   s.clean_paths  = 'Vendor', 'GCD/Xcode', 'RunLoop/Xcode'
   s.requires_arc = true
 
-  if config.ios?
-    s.frameworks = ['CFNetwork', 'Security']
-  else
-    s.frameworks = ['CoreServices', 'Security']
-  end
+  s.ios.frameworks = 'CFNetwork', 'Security'
+  s.osx.frameworks = 'CoreServices', 'Security'
 end
diff --git a/CocoaHTTPServer/2.2.1/CocoaHTTPServer.podspec b/CocoaHTTPServer/2.2.1/CocoaHTTPServer.podspec
index 2fa80c0ed2b608..e8e3eb16fb4caf 100644
--- a/CocoaHTTPServer/2.2.1/CocoaHTTPServer.podspec
+++ b/CocoaHTTPServer/2.2.1/CocoaHTTPServer.podspec
@@ -1,20 +1,20 @@
 Pod::Spec.new do |s|
-  s.name         = 'CocoaHTTPServer'
-  s.version      = '2.2.1'
-  s.license      = 'BSD'
-  s.summary      = 'A small, lightweight, embeddable HTTP server for Mac OS X or iOS applications'
-  s.homepage     = 'https://github.com/robbiehanson/CocoaHTTPServer'
-  s.authors      = { 'Robbie Hanson' => 'cocoahttpserver@googlegroups.com' }
-  s.source       = { :git => 'https://github.com/robbiehanson/CocoaHTTPServer.git', :tag => '2.2.1' }
-  s.source_files = '{Core,Extensions}/**/*.{h,m}'
-  s.clean_paths  = %w{Samples Vendor}
-  if config.ios?
-    s.frameworks = 'CFNetwork', 'Security'
-  else
-    s.frameworks = 'CoreServices', 'Security'
-  end
-  s.library      = 'xml2'
-  s.xcconfig     = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }
+  s.name           = 'CocoaHTTPServer'
+  s.version        = '2.2.1'
+  s.license        = 'BSD'
+  s.summary        = 'A small, lightweight, embeddable HTTP server for Mac OS X or iOS applications'
+  s.homepage       = 'https://github.com/robbiehanson/CocoaHTTPServer'
+  s.authors        = { 'Robbie Hanson' => 'cocoahttpserver@googlegroups.com' }
+  s.source         = { :git => 'https://github.com/robbiehanson/CocoaHTTPServer.git', :tag => '2.2.1' }
+  s.source_files   = '{Core,Extensions}/**/*.{h,m}'
+  s.clean_paths    = %w{Samples Vendor}
+
+  s.ios.frameworks = 'CFNetwork', 'Security'
+  s.osx.frameworks = 'CoreServices', 'Security'
+
+  s.library        = 'xml2'
+  s.xcconfig       = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }
+
   s.dependency "CocoaAsyncSocket", "0.0.1"
   s.dependency "CocoaLumberjack", "1.3"
 end
diff --git a/CorePlot/1.0/CorePlot.podspec b/CorePlot/1.0/CorePlot.podspec
index 22d9e91615adaf..199abb5a2172be 100644
--- a/CorePlot/1.0/CorePlot.podspec
+++ b/CorePlot/1.0/CorePlot.podspec
@@ -16,12 +16,8 @@ Pod::Spec.new do |s|
 
   files = FileList['framework/TestResources/CorePlotProbes.d', 'framework/Source/*.{h,m}']
   files.exclude(/(TestCase|Tests)\.[hm]/)
-  if config.ios?
-    files.include('framework/CorePlot-CocoaTouch.h', 'framework/iPhoneOnly/*.{h,m}')
-  else
-    files.include('framework/CorePlot.h', 'framework/MacOnly/*.{h,m}')
-  end
-  s.source_files = files
+  s.ios.source_files = files.dup.include('framework/CorePlot-CocoaTouch.h', 'framework/iPhoneOnly/*.{h,m}')
+  s.osx.source_files = files.dup.include('framework/CorePlot.h', 'framework/MacOnly/*.{h,m}')
 
   s.clean_paths = 'documentation', 'examples', 'scripts', 'QCPlugin', 'framework/*.{xcodeproj,lproj}'
   s.framework   = 'QuartzCore'
diff --git a/DTCoreText/1.0.0/DTCoreText.podspec b/DTCoreText/1.0.0/DTCoreText.podspec
index 3f639110bf2f27..9819ad65521a17 100644
--- a/DTCoreText/1.0.0/DTCoreText.podspec
+++ b/DTCoreText/1.0.0/DTCoreText.podspec
@@ -1,23 +1,21 @@
 Pod::Spec.new do |spec|
-  spec.name         = 'DTCoreText'
-  spec.version      = '1.0.0'
-  spec.platform     = :ios
-  spec.license      = 'BSD'
-  spec.source       = { :git => 'https://github.com/Cocoanetics/DTCoreText.git', :tag => '1.0.0' }
-  spec.source_files = 'Core/Source/*.{h,m,c}'
-  spec.clean_paths  = 'Core/Test/', 'Core/DTCoreText-Info.plist', 'Core/DTCoreText-Prefix.pch', 'DTCoreText.xcodeproj/', 'Demo/', '.gitignore'
-  spec.frameworks   = 'MediaPlayer', 'QuartzCore', 'CoreText', 'CoreGraphics', 'ImageIO'
-  spec.requires_arc = true
-  spec.homepage     = 'https://github.com/Cocoanetics/DTCoreText'
-  spec.summary      = 'Methods to allow using HTML code with CoreText.'
-  spec.author       = { 'Oliver Drobnik' => 'oliver@drobnik.com' }
-  spec.library      = 'xml2'
-  spec.xcconfig     = { 'HEADER_SEARCH_PATHS' => '"$(SDKROOT)/usr/include/libxml2"' }
+  spec.name               = 'DTCoreText'
+  spec.version            = '1.0.0'
+  spec.platform           = :ios
+  spec.license            = 'BSD'
+  spec.source             = { :git => 'https://github.com/Cocoanetics/DTCoreText.git', :tag => '1.0.0' }
+  spec.prefix_header_file = 'Core/DTCoreText-Prefix.pch'
+  spec.source_files       = 'Core/Source/*.{h,m,c}'
+  spec.clean_paths        = 'Core/Test/', 'Core/DTCoreText-Info.plist', 'DTCoreText.xcodeproj/', 'Demo/', '.gitignore'
+  spec.frameworks         = 'MediaPlayer', 'QuartzCore', 'CoreText', 'CoreGraphics', 'ImageIO'
+  spec.requires_arc       = true
+  spec.homepage           = 'https://github.com/Cocoanetics/DTCoreText'
+  spec.summary            = 'Methods to allow using HTML code with CoreText.'
+  spec.author             = { 'Oliver Drobnik' => 'oliver@drobnik.com' }
+  spec.library            = 'xml2'
+  spec.xcconfig           = { 'HEADER_SEARCH_PATHS' => '"$(SDKROOT)/usr/include/libxml2"' }
+
   def spec.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import <CoreText/CoreText.h>\n#endif\n#define ALLOW_IPHONE_SPECIAL_CASES 1})
-    end
     Dir.chdir(config.project_pods_root + 'DTCoreText/Core/Source/') do
       Dir.glob('*.css') do |css_file|
         system '/usr/bin/xxd', '-i', css_file, css_file + '.c'
diff --git a/FileMD5Hash/0.0.1/FileMD5Hash.podspec b/FileMD5Hash/0.0.1/FileMD5Hash.podspec
index 2577ba4b6a2897..c2c6b535d99c28 100644
--- a/FileMD5Hash/0.0.1/FileMD5Hash.podspec
+++ b/FileMD5Hash/0.0.1/FileMD5Hash.podspec
@@ -7,13 +7,7 @@ Pod::Spec.new do |s|
   s.author   = { 'Joel Lopes Da Silva' => 'joel@lopes-da-silva.com' }
   s.source   = { :git => 'https://github.com/JoeKun/FileMD5Hash.git', :commit => 'd00c0c51c6d0955d9daf94c30cfd95a219d4914e' }
 
+  s.prefix_header_file = 'Common/FileMD5Hash_Prefix.pch'
   s.source_files = 'Common/*.{h,c}'
   s.clean_paths = "Mac", "iOS", 'FileMD5Hash.xcodeproj'
-
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#import "FileMD5Hash_Prefix.pch"})
-    end
-  end
 end
diff --git a/MKNetworkKit/0.82/MKNetworkKit.podspec b/MKNetworkKit/0.82/MKNetworkKit.podspec
index 7afca843eb9180..9df01a24194b8a 100644
--- a/MKNetworkKit/0.82/MKNetworkKit.podspec
+++ b/MKNetworkKit/0.82/MKNetworkKit.podspec
@@ -7,15 +7,15 @@ Pod::Spec.new do |s|
   s.author   = { 'MugunthKumar' => 'mknetworkkit@mk.sg' }
   s.source   = { :git => 'https://github.com/MugunthKumar/MKNetworkKit.git', :tag => 'v0.82' }
 
+  s.prefix_header_contents = '#import "MKNetworkKit.h"'
+
   files = FileList['MKNetworkKit/*.{h,m}', 'MKNetworkKit/Categories/*.{h,m}']
-  if config.ios?
-    files.exclude(/NSAlert/)
-    s.frameworks = 'CFNetwork', 'Security'
-  else
-    files.exclude(/UIAlertView/)
-    s.frameworks = 'CoreServices', 'Security'
-  end
-  s.source_files = files
+  s.ios.source_files = files.dup.exclude(/NSAlert/)
+  s.osx.source_files = files.dup.exclude(/UIAlertView/)
+
+  s.ios.frameworks = 'CFNetwork', 'Security'
+  s.osx.frameworks = 'CoreServices', 'Security'
+
   s.clean_paths  = 'MKNetworkKit-*', '*-Demo', 'SampleImage.jpg'
   s.requires_arc = true
 
@@ -29,12 +29,6 @@ Pod::Spec.new do |s|
     header.open('w') do |file|
      file.puts(header_contents)
     end
-
-    # Add MKNetworkKit.h to the prefix header
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "MKNetworkKit.h"\n#endif})
-    end
   end
 end
 
diff --git a/MKNetworkKit/0.83/MKNetworkKit.podspec b/MKNetworkKit/0.83/MKNetworkKit.podspec
index df2e826db95083..d7806ee88ec45d 100644
--- a/MKNetworkKit/0.83/MKNetworkKit.podspec
+++ b/MKNetworkKit/0.83/MKNetworkKit.podspec
@@ -7,15 +7,15 @@ Pod::Spec.new do |s|
   s.author   = { 'MugunthKumar' => 'mknetworkkit@mk.sg' }
   s.source   = { :git => 'https://github.com/MugunthKumar/MKNetworkKit.git', :tag => 'v0.83' }
 
+  s.prefix_header_contents = '#import "MKNetworkKit.h"'
+
   files = FileList['MKNetworkKit/*.{h,m}', 'MKNetworkKit/Categories/*.{h,m}']
-  if config.ios?
-    files.exclude(/NSAlert/)
-    s.frameworks = 'CFNetwork', 'Security'
-  else
-    files.exclude(/UIAlertView/)
-    s.frameworks = 'CoreServices', 'Security'
-  end
-  s.source_files = files
+  s.ios.source_files = files.dup.exclude(/NSAlert/)
+  s.osx.source_files = files.dup.exclude(/UIAlertView/)
+
+  s.ios.frameworks = 'CFNetwork', 'Security'
+  s.osx.frameworks = 'CoreServices', 'Security'
+
   s.clean_paths  = 'MKNetworkKit-*', '*-Demo', 'SampleImage.jpg'
   s.requires_arc = true
 
@@ -29,12 +29,6 @@ Pod::Spec.new do |s|
     header.open('w') do |file|
      file.puts(header_contents)
     end
-
-    # Add MKNetworkKit.h to the prefix header
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "MKNetworkKit.h"\n#endif})
-    end
   end
 end
 
diff --git a/MagicalRecord/1.7.1/MagicalRecord.podspec b/MagicalRecord/1.7.1/MagicalRecord.podspec
index bccd3f1ce8fdc7..4bfb6d557aa31d 100644
--- a/MagicalRecord/1.7.1/MagicalRecord.podspec
+++ b/MagicalRecord/1.7.1/MagicalRecord.podspec
@@ -9,11 +9,5 @@ Pod::Spec.new do |s|
   s.description  = 'Handy fetching, threading and data import helpers to make Core Data a little easier to use.'
   s.source_files = 'Source/**/*.{h,m}'
   s.framework    = 'CoreData'
-
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#define MR_SHORTHAND 1\n#import "CoreData+MagicalRecord.h"\n#endif})
-    end
-  end
+  s.prefix_header_contents = "#define MR_SHORTHAND 1\n#import \"CoreData+MagicalRecord.h\""
 end
diff --git a/MagicalRecord/1.8.3/MagicalRecord.podspec b/MagicalRecord/1.8.3/MagicalRecord.podspec
index 18501a1c10eb9f..daaaf8aedf0a5d 100644
--- a/MagicalRecord/1.8.3/MagicalRecord.podspec
+++ b/MagicalRecord/1.8.3/MagicalRecord.podspec
@@ -10,11 +10,5 @@ Pod::Spec.new do |s|
   s.source_files = 'Source/**/*.{h,m}'
   s.framework    = 'CoreData'
   s.clean_paths  = 'iOS App Unit Tests', 'Mac App Unit Tests', 'Magical Record.xcodeproj', 'Unit Tests'
-
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#define MR_SHORTHAND 1\n#import "CoreData+MagicalRecord.h"\n#endif})
-    end
-  end
+  s.prefix_header_contents = "#define MR_SHORTHAND 1\n#import \"CoreData+MagicalRecord.h\""
 end
diff --git a/NLCoreData/0.1.0/NLCoreData.podspec b/NLCoreData/0.1.0/NLCoreData.podspec
index 7b7106694c1c70..1c5463ea09732a 100644
--- a/NLCoreData/0.1.0/NLCoreData.podspec
+++ b/NLCoreData/0.1.0/NLCoreData.podspec
@@ -11,11 +11,6 @@ Pod::Spec.new do |s|
   s.framework     = 'CoreData'
   s.requires_arc  = true
   s.clean_paths   = 'NLCoreDataExample/', 'NLCoreDataExample.xcodeproj/', 'NLCoreDataExampleTests/', '.git/', '.gitignore'
-  
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "NLCoreData.h"\n#endif})
-    end
-  end
+
+  s.prefix_header_contents = '#import "NLCoreData.h"'
 end
diff --git a/NLCoreData/0.1.1/NLCoreData.podspec b/NLCoreData/0.1.1/NLCoreData.podspec
index 159e8935383cab..c047bbb420b341 100644
--- a/NLCoreData/0.1.1/NLCoreData.podspec
+++ b/NLCoreData/0.1.1/NLCoreData.podspec
@@ -11,11 +11,6 @@ Pod::Spec.new do |s|
   s.framework     = 'CoreData'
   s.requires_arc  = true
   s.clean_paths   = 'NLCoreDataExample/', 'NLCoreDataExample.xcodeproj/', 'NLCoreDataExampleTests/', '.git/', '.gitignore'
-  
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "NLCoreData.h"\n#endif})
-    end
-  end
+
+  s.prefix_header_contents = '#import "NLCoreData.h"'
 end
diff --git a/NLCoreData/0.2.0/NLCoreData.podspec b/NLCoreData/0.2.0/NLCoreData.podspec
index 1c1dde5fc3ffad..ae58336b8a8da0 100644
--- a/NLCoreData/0.2.0/NLCoreData.podspec
+++ b/NLCoreData/0.2.0/NLCoreData.podspec
@@ -11,11 +11,6 @@ Pod::Spec.new do |s|
   s.framework     = 'CoreData'
   s.requires_arc  = true
   s.clean_paths   = 'NLCoreDataExample/', 'NLCoreDataExample.xcodeproj/', 'NLCoreDataTests/', 'TODO'
-  
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "NLCoreData.h"\n#endif})
-    end
-  end
+
+  s.prefix_header_contents = '#import "NLCoreData.h"'
 end
diff --git a/NLKit/0.1.0/NLKit.podspec b/NLKit/0.1.0/NLKit.podspec
index 47f3f27e148991..783d8bf0128223 100644
--- a/NLKit/0.1.0/NLKit.podspec
+++ b/NLKit/0.1.0/NLKit.podspec
@@ -11,11 +11,6 @@ Pod::Spec.new do |s|
   s.framework     = 'CoreLocation', 'MessageUI', 'Security', 'QuartzCore'
   s.requires_arc  = true
   s.clean_paths   = 'NLKitExample/', 'NLKitExample.xcodeproj/', 'NLKitTests/', '.git/', '.gitignore', 'TODO'
-  
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "NLKit.h"\n#endif})
-    end
-  end
+
+  s.prefix_header_contents = '#import "NLKit.h"'
 end
diff --git a/NLKit/0.1.1/NLKit.podspec b/NLKit/0.1.1/NLKit.podspec
index a99e2cd716187e..acc82770c9073b 100644
--- a/NLKit/0.1.1/NLKit.podspec
+++ b/NLKit/0.1.1/NLKit.podspec
@@ -11,11 +11,6 @@ Pod::Spec.new do |s|
   s.framework     = 'CoreLocation', 'MessageUI', 'Security', 'QuartzCore'
   s.requires_arc  = true
   s.clean_paths   = 'NLKitExample/', 'NLKitExample.xcodeproj/', 'NLKitTests/', 'TODO'
-  
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "NLKit.h"\n#endif})
-    end
-  end
+
+  s.prefix_header_contents = '#import "NLKit.h"'
 end
diff --git a/NLKit/0.1.2/NLKit.podspec b/NLKit/0.1.2/NLKit.podspec
index 68a9fa69da7ca0..9df5bda211ed9b 100644
--- a/NLKit/0.1.2/NLKit.podspec
+++ b/NLKit/0.1.2/NLKit.podspec
@@ -11,11 +11,6 @@ Pod::Spec.new do |s|
   s.framework     = 'CoreLocation', 'MessageUI', 'Security', 'QuartzCore'
   s.requires_arc  = true
   s.clean_paths   = 'NLKitExample/', 'NLKitExample.xcodeproj/', 'NLKitTests/', 'TODO'
-  
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "NLKit.h"\n#endif})
-    end
-  end
+
+  s.prefix_header_contents = '#import "NLKit.h"'
 end
diff --git a/NLKit/0.1.3/NLKit.podspec b/NLKit/0.1.3/NLKit.podspec
index b16a6cd53ed66e..9ca28d25fae67d 100644
--- a/NLKit/0.1.3/NLKit.podspec
+++ b/NLKit/0.1.3/NLKit.podspec
@@ -11,11 +11,6 @@ Pod::Spec.new do |s|
   s.framework     = 'CoreLocation', 'MessageUI', 'Security', 'QuartzCore'
   s.requires_arc  = true
   s.clean_paths   = 'NLKitExample/', 'NLKitExample.xcodeproj/', 'NLKitTests/', 'TODO'
-  
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "NLKit.h"\n#endif})
-    end
-  end
+
+  s.prefix_header_contents = '#import "NLKit.h"'
 end
diff --git a/QuickDialog/0.1/QuickDialog.podspec b/QuickDialog/0.1/QuickDialog.podspec
index 364cad81f2fb33..d39468d4010189 100644
--- a/QuickDialog/0.1/QuickDialog.podspec
+++ b/QuickDialog/0.1/QuickDialog.podspec
@@ -17,10 +17,5 @@ Pod::Spec.new do |s|
   s.clean_paths  = 'sample', '*.xc*', 'libQuickDialog', 'other'
   s.requires_arc = true
 
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "QuickDialog.h"\n#endif})
-    end
-  end
+  s.prefix_header_contents = '#import "QuickDialog.h"'
 end
diff --git a/QuickDialog/0.2/QuickDialog.podspec b/QuickDialog/0.2/QuickDialog.podspec
index 3e132f483aa9a6..09fde126a924db 100644
--- a/QuickDialog/0.2/QuickDialog.podspec
+++ b/QuickDialog/0.2/QuickDialog.podspec
@@ -17,10 +17,5 @@ Pod::Spec.new do |s|
   s.clean_paths  = 'sample', '*.xc*', 'libQuickDialog', 'other'
   s.requires_arc = true
 
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "QuickDialog.h"\n#endif})
-    end
-  end
+  s.prefix_header_contents = '#import "QuickDialog.h"'
 end
diff --git a/QuickDialog/0.3/QuickDialog.podspec b/QuickDialog/0.3/QuickDialog.podspec
index 2f16f6a19ccf31..8dd6e44b37e183 100644
--- a/QuickDialog/0.3/QuickDialog.podspec
+++ b/QuickDialog/0.3/QuickDialog.podspec
@@ -18,10 +18,5 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.framework = 'MapKit' , 'CoreLocation'
 
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "QuickDialog.h"\n#endif})
-    end
-  end
+  s.prefix_header_contents = '#import "QuickDialog.h"'
 end
diff --git a/QuincyKit/2.1.7/QuincyKit.podspec b/QuincyKit/2.1.7/QuincyKit.podspec
index ac8ffa2baa7f7f..3dc68406239fa0 100644
--- a/QuincyKit/2.1.7/QuincyKit.podspec
+++ b/QuincyKit/2.1.7/QuincyKit.podspec
@@ -8,16 +8,13 @@ Pod::Spec.new do |s|
   s.author   = { 'Andreas Linde' => 'mail@andreaslinde.de' }
   s.source   = { :git => 'https://github.com/TheRealKerni/QuincyKit.git', :tag => '2.1.7' }
 
-  if config.ios?
-    s.source_files = 'client/iOS/*.{h,m}'
-    s.resource     = 'client/iOS/Quincy.bundle'
-    s.clean_paths  = 'client/iOS/QuincyLib', 'client/Mac', 'demo', 'server'
+  s.clean_paths  = 'client/iOS/QuincyLib', 'demo', 'server'
 
-    s.frameworks   = 'SystemConfiguration', 'CrashReporter'
-    s.xcconfig     = { 'FRAMEWORK_SEARCH_PATHS' => '"$(PODS_ROOT)/QuincyKit/client/iOS"' }
-  else
-    s.source_files = 'client/Mac/*.{h,m}'
-    s.resource     = 'client/Mac/BWQuincyMain.nib'
-    s.clean_paths  = 'client/iOS', 'demo', 'server'
-  end
+  s.ios.source_files = 'client/iOS/*.{h,m}'
+  s.ios.resource     = 'client/iOS/Quincy.bundle'
+  s.ios.frameworks   = 'SystemConfiguration', 'CrashReporter'
+  s.ios.xcconfig     = { 'FRAMEWORK_SEARCH_PATHS' => '"$(PODS_ROOT)/QuincyKit/client/iOS"' }
+
+  s.osx.source_files = 'client/Mac/*.{h,m}'
+  s.osx.resource     = 'client/Mac/BWQuincyMain.nib'
 end
diff --git a/RestKit/0.10.0/RestKit.podspec b/RestKit/0.10.0/RestKit.podspec
index c6496e9c74a558..f79184617e7297 100644
--- a/RestKit/0.10.0/RestKit.podspec
+++ b/RestKit/0.10.0/RestKit.podspec
@@ -41,11 +41,9 @@ Pod::Spec.new do |s|
     ns.dependency 'FileMD5Hash'
     ns.dependency 'SOCKit'
     ns.source_files = 'Code/RestKit.h', 'Code/{Network,Support}/*.{h,m}'
-    if config.ios?
-      ns.frameworks = 'CFNetwork', 'Security', 'MobileCoreServices', 'SystemConfiguration'
-    else
-      ns.frameworks = 'CoreServices', 'Security', 'SystemConfiguration'
-    end
+
+    ns.ios.frameworks = 'CFNetwork', 'Security', 'MobileCoreServices', 'SystemConfiguration'
+    ns.osx.frameworks = 'CoreServices', 'Security', 'SystemConfiguration'
   end
 
   # Full name: RestKit/UI
diff --git a/RestKit/0.9.3/RestKit.podspec b/RestKit/0.9.3/RestKit.podspec
index dab8729722debb..43ce1d0a2ca6a4 100644
--- a/RestKit/0.9.3/RestKit.podspec
+++ b/RestKit/0.9.3/RestKit.podspec
@@ -20,11 +20,8 @@ Pod::Spec.new do |s|
     ns.description = 'The network layer provides a request/response abstraction on top of NSURLConnection.'
     ns.dependency 'LibComponentLogging-NSLog'
     ns.source_files = 'Code/RestKit.h', 'Code/{Network,Support}/*.{h,m}'
-    if config.ios?
-        ns.frameworks = 'CFNetwork', 'Security', 'MobileCoreServices', 'SystemConfiguration'
-    else
-        ns.frameworks = 'CoreServices', 'Security', 'SystemConfiguration'
-    end
+    ns.ios.frameworks = 'CFNetwork', 'Security', 'MobileCoreServices', 'SystemConfiguration'
+    ns.osx.frameworks = 'CoreServices', 'Security', 'SystemConfiguration'
   end
 
   # Like before, this creates a new spec with the name: RestKit/ObjectMapping and is a part of RestKit
diff --git a/SSToolkit/0.1.1/SSToolkit.podspec b/SSToolkit/0.1.1/SSToolkit.podspec
index 592e3206f47e1c..ab41435ebf52d0 100644
--- a/SSToolkit/0.1.1/SSToolkit.podspec
+++ b/SSToolkit/0.1.1/SSToolkit.podspec
@@ -15,10 +15,5 @@ Pod::Spec.new do |s|
   s.source_files = 'SSToolkit/**/*.{h,m}'
   s.frameworks   = 'QuartzCore', 'CoreGraphics'
 
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "SSToolkitDefines.h"\n#endif})
-    end
-  end
+  s.prefix_header_file = 'Other Sources/SSToolkit_Prefix.pch'
 end
diff --git a/SSToolkit/0.1.2/SSToolkit.podspec b/SSToolkit/0.1.2/SSToolkit.podspec
index 37137d34c5f545..d1de53b9088955 100644
--- a/SSToolkit/0.1.2/SSToolkit.podspec
+++ b/SSToolkit/0.1.2/SSToolkit.podspec
@@ -15,10 +15,5 @@ Pod::Spec.new do |s|
   s.source_files = 'SSToolkit/**/*.{h,m}'
   s.frameworks   = 'QuartzCore', 'CoreGraphics'
 
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "SSToolkitDefines.h"\n#endif})
-    end
-  end
+  s.prefix_header_file = 'Other Sources/SSToolkit_Prefix.pch'
 end
diff --git a/SocketRocket/0.1/SocketRocket.podspec b/SocketRocket/0.1/SocketRocket.podspec
index 8eacc788fd5dc1..701d60767e4ea7 100644
--- a/SocketRocket/0.1/SocketRocket.podspec
+++ b/SocketRocket/0.1/SocketRocket.podspec
@@ -8,11 +8,9 @@ Pod::Spec.new do |s|
   s.source_files = 'SocketRocket/*.{h,m,c}'
   s.clean_paths  = %w{SRWebSocketTests SocketRocket.xcodeproj TestChat TestChatServer TestSupport extern}
   s.requires_arc = true
-  
-  if config.ios?
-      s.frameworks = %w{CFNetwork Security}
-  else
-      s.frameworks = %w{CoreServices Security}
-  end
+
+  s.ios.frameworks = %w{CFNetwork Security}
+  s.osx.frameworks = %w{CoreServices Security}
+
   s.libraries    = "icucore"
 end
diff --git a/ZBarSDK/1.2.2/ZBarSDK.podspec b/ZBarSDK/1.2.2/ZBarSDK.podspec
index faf880e13b7a5d..f4740b3d1bfebb 100644
--- a/ZBarSDK/1.2.2/ZBarSDK.podspec
+++ b/ZBarSDK/1.2.2/ZBarSDK.podspec
@@ -30,16 +30,10 @@ Pod::Spec.new do |s|
                  "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*]" => 'ZBarReaderViewImpl_Capture.m ZBarCaptureReader.m',
                  "GCC_PREPROCESSOR_DEFINITIONS"                             => '$(inherited) NDEBUG=1' }
 
+  s.prefix_header_file = 'iphone/include/prefix.pch'
+
   # Maintain the dir structure for headers
   def s.copy_header_mapping(from)
     from
   end
-
-  # Append the prefix header to the Pods prefix header
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts((pod_destroot + 'iphone/include/prefix.pch').read)
-    end
-  end
 end
diff --git a/ZipKit/0.0.1/ZipKit.podspec b/ZipKit/0.0.1/ZipKit.podspec
index 8b3ecff89c97ff..1506856b649044 100644
--- a/ZipKit/0.0.1/ZipKit.podspec
+++ b/ZipKit/0.0.1/ZipKit.podspec
@@ -16,11 +16,11 @@ Pod::Spec.new do |s|
                   "invoking object (e.g., a NSOperation or NSThread)."
 
   files = FileList['**/*.{h,m}']
-  files.exclude(/GMAppleDouble/) if config.ios?
-  s.source_files = files
+  s.ios.source_files = files.dup.exclude(/GMAppleDouble/)
+  s.osx.source_files = files
 
   s.clean_paths = 'ZipKit.{xcodeproj,lineform}', 'ZipKitFW-Info.plist', 'ZipKit_Prefix.pch', 'Demo Projects'
 
   s.library = 'z'
-  s.framework = 'CoreServices' if config.osx?
+  s.osx.framework = 'CoreServices'
 end
diff --git a/libffi/3.0.11/libffi.podspec b/libffi/3.0.11/libffi.podspec
index 7b8ff122ea0f5a..2850c4fb0fde2f 100644
--- a/libffi/3.0.11/libffi.podspec
+++ b/libffi/3.0.11/libffi.podspec
@@ -12,10 +12,9 @@ Pod::Spec.new do |s|
                     'Zachary Waldowski' => 'zwaldowski@gmail.com' }
   s.source      = { :git => 'https://github.com/zwaldowski/libffi-iOS.git', :tag => 'v3.0.11' }
   s.clean_paths = 'patches/', 'libffi.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.source_files = 'ios/include/*.h', 'ios/src/arm/*.{c,S}', 'ios/src/x86/{ffi.c,darwin.S}', 'src/{closures,prep_cif,raw_api,types}.c'
-  else
-    s.source_files = 'osx/include/*.h', 'osx/src/x86/{darwin.S,darwin64.S,ffi.c,ffi64.c}', 'src/{closures,prep_cif,raw_api,types}.c'
-  end
+
+  s.ios.source_files = 'ios/include/*.h', 'ios/src/arm/*.{c,S}', 'ios/src/x86/{ffi.c,darwin.S}', 'src/{closures,prep_cif,raw_api,types}.c'
+  s.osx.source_files = 'osx/include/*.h', 'osx/src/x86/{darwin.S,darwin64.S,ffi.c,ffi64.c}', 'src/{closures,prep_cif,raw_api,types}.c'
+
   s.xcconfig    = { 'OTHER_LDFLAGS' => "-Wl,-no_compact_unwind" }
-end
\ No newline at end of file
+end