--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/mac/MacAppStoreBundler.java	2018-01-19 17:51:38.000000000 -0800
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/mac/MacAppStoreBundler.java	2018-01-19 17:51:38.000000000 -0800
@@ -144,6 +144,11 @@
         try {
             appImageDir.mkdirs();
 
+            try {
+                MacAppImageBuilder.addNewKeychain(p);
+            } catch (InterruptedException e) {
+                Log.error(e.getMessage());
+            }
             // first, make sure we don't use the local signing key
             p.put(DEVELOPER_ID_APP_SIGNING_KEY.getID(), null);
             File appLocation = prepareAppBundle(p);
@@ -156,6 +161,8 @@
             String inheritEntitlements = getConfig_Inherit_Entitlements(p).toString();
 
             MacAppImageBuilder.signAppBundle(p, appLocation.toPath(), signingIdentity, identifierPrefix, entitlementsFile, inheritEntitlements);
+            MacAppImageBuilder.restoreKeychainList(p);
+            
             ProcessBuilder pb;
 
             // create the final pkg file