diff --git a/Components.plist b/Components.plist
new file mode 100644
index 0000000000..79d50183b6
--- /dev/null
+++ b/Components.plist
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>BundleIsVersionChecked</key>
+		<false/>
+		<key>BundleOverwriteAction</key>
+		<string>upgrade</string>
+		<key>ChildBundles</key>
+		<array>
+			<dict>
+				<key>BundleOverwriteAction</key>
+				<string></string>
+				<key>RootRelativeBundlePath</key>
+				<string>Library/Frameworks/CarthageKit.framework/Versions/A/Frameworks/LlamaKit.framework</string>
+			</dict>
+			<dict>
+				<key>BundleOverwriteAction</key>
+				<string></string>
+				<key>RootRelativeBundlePath</key>
+				<string>Library/Frameworks/CarthageKit.framework/Versions/A/Frameworks/ReactiveCocoa.framework</string>
+			</dict>
+		</array>
+		<key>RootRelativeBundlePath</key>
+		<string>Library/Frameworks/CarthageKit.framework</string>
+	</dict>
+</array>
+</plist>
diff --git a/Makefile b/Makefile
index c700f10d84..c9574659f8 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ BINARIES_FOLDER=/usr/local/bin
 OUTPUT_PACKAGE=Carthage.pkg
 
 VERSION_STRING=$(shell agvtool what-marketing-version -terse1)
+COMPONENTS_PLIST=Components.plist
 
 .PHONY: all bootstrap clean install package test uninstall
 
@@ -50,4 +51,10 @@ package: clean bootstrap
 	mv -f "$(CARTHAGE_EXECUTABLE)" "$(TEMPORARY_FOLDER)$(BINARIES_FOLDER)/carthage"
 	rm -rf "$(BUILT_BUNDLE)"
 
-	productbuild --root "$(TEMPORARY_FOLDER)" "/" --identifier "org.carthage.carthage" --version "$(VERSION_STRING)" "$(OUTPUT_PACKAGE)"
+	pkgbuild \
+		--component-plist "$(COMPONENTS_PLIST)" \
+		--identifier "org.carthage.carthage" \
+		--install-location "/" \
+		--root "$(TEMPORARY_FOLDER)" \
+		--version "$(VERSION_STRING)" \
+		"$(OUTPUT_PACKAGE)"