diff --git a/build/build.xml b/build/build.xml
index 99c0fb1ca..fff0e2ec0 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -275,9 +275,14 @@
     <!-- Unzip unsigned app into working dir -->
     <unzip dest="macosx/work" src="macosx/arduino-${version}-${platform}.zip" overwrite="false"/>
 
+    <!-- Unlock keychain file -->
+    <exec executable="security" dir="macosx/work">
+      <arg line="unlock-keychain -p &quot;${macosx-sign-keychain-pass}&quot; &quot;${macosx-sign-keychain}&quot;" />
+    </exec>
+
     <!-- Sign app -->
     <exec executable="codesign" dir="macosx/work" failonerror="true">
-      <arg line="-s &quot;${macosx-sign-id}&quot; -v Arduino.app/" />
+      <arg line="--keychain &quot;${macosx-sign-keychain}&quot; -s &quot;${macosx-sign-id}&quot; -v Arduino.app/" />
     </exec>
 
     <!-- Create signed zip file -->
@@ -295,7 +300,9 @@
   </target>
 
   <target name="macosx-singed-dist-check">
-    <fail unless="macosx-sign-id" message="Please set the property 'macosx-sign-id' to correctly sign distribution file" />
+    <fail unless="macosx-sign-keychain" message="Please set the property 'macosx-sign-keychain' to the correct keychain file" />
+    <fail unless="macosx-sign-keychain-pass" message="Please set the property 'macosx-sign-keychain-pass' with the password to unlock the keychain" />
+    <fail unless="macosx-sign-id" message="Please set the property 'macosx-sign-id' to the correct cert identifier" />
   </target>
 
   <!-- - - - - - - - - - - - - - - - - - - -->