diff --git a/cocoapods/mailcore2-ios.podspec b/cocoapods/mailcore2-ios.podspec
index bf9ca288c..846276f55 100644
--- a/cocoapods/mailcore2-ios.podspec
+++ b/cocoapods/mailcore2-ios.podspec
@@ -10,6 +10,7 @@ Pod::Spec.new do |spec|
   spec.source       = { :http => "https://d.etpan.org/mailcore2-deps/mailcore2-ios/mailcore2-ios-12.zip", :flatten => true }
   spec.header_dir   = "MailCore"
   spec.requires_arc = false
+  spec.source_files = "include/MailCore/*.h"
   spec.public_header_files = "include/MailCore/*.h"
   spec.preserve_paths = "include/MailCore/*.h"
   spec.vendored_libraries = "lib/libMailCore-ios.a"
diff --git a/cocoapods/mailcore2-osx.podspec b/cocoapods/mailcore2-osx.podspec
index e2732d43b..3f71599e4 100644
--- a/cocoapods/mailcore2-osx.podspec
+++ b/cocoapods/mailcore2-osx.podspec
@@ -10,6 +10,7 @@ Pod::Spec.new do |spec|
   spec.source       = { :http => "https://d.etpan.org/mailcore2-deps/mailcore2-osx/mailcore2-osx-12.zip", :flatten => true }
   spec.header_dir   = "MailCore"
   spec.requires_arc = false
+  spec.source_files = "include/MailCore/*.h"
   spec.public_header_files = "include/MailCore/*.h"
   spec.preserve_paths = "include/MailCore/*.h"
   spec.vendored_libraries = "lib/libMailCore.a"
diff --git a/mailcore2-ios.podspec b/mailcore2-ios.podspec
index 36979aee0..706d4388e 100644
--- a/mailcore2-ios.podspec
+++ b/mailcore2-ios.podspec
@@ -10,9 +10,10 @@ Pod::Spec.new do |spec|
   spec.source       = { :http => "https://d.etpan.org/mailcore2-deps/mailcore2-ios/mailcore2-ios-12.zip", :flatten => true }
   spec.header_dir   = "MailCore"
   spec.requires_arc = false
+  spec.source_files = "cocoapods-build/include/MailCore/*.h"
   spec.public_header_files = "cocoapods-build/include/MailCore/*.h"
   spec.preserve_paths = "cocoapods-build/include/MailCore/*.h"
-  spec.vendored_libraries = "cocoapods-build/lib/libMailCore.a"
+  spec.vendored_libraries = "cocoapods-build/lib/libMailCore-ios.a"
   spec.libraries = ["xml2", "iconv", "z", "c++", "resolv"]
   spec.prepare_command = "./scripts/build-mailcore2-ios-cocoapod.sh"
 end
diff --git a/mailcore2-osx.podspec b/mailcore2-osx.podspec
index a3cb666cb..b1d83ac55 100644
--- a/mailcore2-osx.podspec
+++ b/mailcore2-osx.podspec
@@ -10,6 +10,7 @@ Pod::Spec.new do |spec|
   spec.source       = { :http => "https://d.etpan.org/mailcore2-deps/mailcore2-osx/mailcore2-osx-12.zip", :flatten => true }
   spec.header_dir   = "MailCore"
   spec.requires_arc = false
+  spec.source_files = "cocoapods-build/include/MailCore/*.h"
   spec.public_header_files = "cocoapods-build/include/MailCore/*.h"
   spec.preserve_paths = "cocoapods-build/include/MailCore/*.h"
   spec.vendored_libraries = "cocoapods-build/lib/libMailCore.a"