diff --git a/Makefile.am b/Makefile.am
index ae5ec2271..c72151e40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -242,11 +242,15 @@ signed-bundle: $(MACAPPNAME)
 	cd $(BUNDLEDIR)/.. && rm -f $(MAXAPPDMG) && hdiutil create $(MACAPPDMG) -srcfolder $(MACAPPNAME) -ov && cd -
 
 pkg: $(MACAPPNAME)
-	rm -rf ${srcdir}/packaging
-	mkdir ${srcdir}/packaging
-	pkgbuild --install-location /Applications --scripts ${srcdir}/build/macos/pkg-scripts --sign "$(BUNDLE_SIGNING_ID)" --component $(MACAPPNAME) ${srcdir}/packaging/linphone.pkg
-	productbuild --distribution ${srcdir}/build/macos/pkg-distribution.xml --resources ${srcdir}/packaging $(MACAPPPKG}
+	rm -rf ./packaging
+	mkdir -p ./packaging
+	cp ${srcdir}/COPYING ./packaging
+	pkgbuild --install-location /Applications --scripts ${srcdir}/build/macos/pkg-scripts --component $(MACAPPNAME) ./packaging/linphone.pkg
+	productbuild --resources . --distribution ${srcdir}/build/macos/pkg-distribution.xml --package-path ./packaging $(MACAPPPKG)
 	
+signed-pkg: pkg
+	productsign --sign "$(BUNDLE_SIGNING_ID)" $(MACAPPPKG) $(MACAPPPKG)
+
 
 ###
 ### CLEAN
@@ -258,6 +262,6 @@ discovery:
 	$(CC) --include $(top_builddir)/config.h \
         $(TUNNEL_CFLAGS) $(CFLAGS) $(MEDIASTREAMER2_CFLAGS) $(ORTP_CFLAGS)  $(SIPSTACK_CFLAGS) $(CUNIT_CFLAGS) -E -P -v -dD specs.c
 
-.PHONY: $(MACAPPNAME)
+.PHONY: $(MACAPPNAME) pkg
 
 
diff --git a/build/macos/Makefile.am b/build/macos/Makefile.am
index 6556fb5d8..bff44fefc 100644
--- a/build/macos/Makefile.am
+++ b/build/macos/Makefile.am
@@ -1,3 +1,7 @@
-EXTRA_DIST=linphone.bundle environment.sh Info-linphone.plist.in pkg-scripts/postinstall
-
+EXTRA_DIST= \
+	linphone.bundle \
+	environment.sh \
+	Info-linphone.plist.in \
+	pkg-scripts/postinstall \
+	pkg-distribution.xml.in
 
diff --git a/build/macos/pkg-distribution.xml.in b/build/macos/pkg-distribution.xml.in
index 547fc5e05..37cd80ebe 100644
--- a/build/macos/pkg-distribution.xml.in
+++ b/build/macos/pkg-distribution.xml.in
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <installer-gui-script minSpecVersion="1">
-	<pkg-ref id="org.linphone.linphone"/>
-	<options customize="never" require-scripts="false"/>
-	<choices-outline>
-		<line choice="default">
-			<line choice="org.linphone.linphone"/>
-		</line>
-	</choices-outline>
-	<choice id="default"/>
-	<choice id="org.linphone.linphone" visible="false">
-		<pkg-ref id="org.linphone.linphone"/>
-	</choice>
-	<pkg-ref id="org.linphone.linphone" version="@PACKAGE_VERSION@" onConclusion="none">linphone.pkg</pkg-ref>
-	<licence file="COPYING" />
+    <pkg-ref id="org.linphone.linphone"/>
+    <options customize="never" require-scripts="false"/>
+    <choices-outline>
+        <line choice="default">
+            <line choice="org.linphone.linphone"/>
+        </line>
+    </choices-outline>
+    <choice id="default"/>
+    <choice id="org.linphone.linphone" visible="false">
+        <pkg-ref id="org.linphone.linphone"/>
+    </choice>
+    <pkg-ref id="org.linphone.linphone" version="@PACKAGE_VERSION@" onConclusion="none">linphone.pkg</pkg-ref>
+    <license file="COPYING" mime-type="text/plain"/>
 </installer-gui-script>
-
diff --git a/configure.ac b/configure.ac
index e8103004d..30a136940 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1041,6 +1041,7 @@ AC_CONFIG_FILES([
 	build/Makefile
 	build/macos/Makefile
 	build/macos/Info-linphone.plist
+	build/macos/pkg-distribution.xml
 	m4/Makefile
 	po/Makefile.in
 	pixmaps/Makefile