Index: /trunk/native/macosx/macos-jpackage.sh
===================================================================
--- /trunk/native/macosx/macos-jpackage.sh	(revision 19031)
+++ /trunk/native/macosx/macos-jpackage.sh	(revision 19032)
@@ -106,15 +106,4 @@
     llvm-lipo-15 -create -output "${1}" "${2}" "${3}"
   fi
-  if [ -n "${KEYCHAINPATH}" ]; then
-    codesign --remove-signature "${1}"
-    codesign --sign "FOSSGIS e.V." \
-      --force \
-      --keychain "${KEYCHAINPATH}" \
-      --timestamp \
-      --prefix "de.openstreetmap.josm" \
-      --identifier "de.openstreetmap.josm" \
-      --options runtime \
-      --verbose=4 "${1}"
-  fi
 }
 
@@ -161,4 +150,18 @@
   do_signapp "JOSM_${first}"
   do_signapp "JOSM_${second}"
+  if [ -n "${KEYCHAINPATH}" ]; then
+    function do_codesign() {
+      codesign --sign "FOSSGIS e.V." \
+        --force \
+        --keychain "${KEYCHAINPATH}" \
+        --timestamp \
+        --prefix "de.openstreetmap.josm" \
+        --identifier "${2}" \
+        --options runtime \
+        --verbose=4 "${1}"
+    }
+    do_codesign app/JOSM.app/Contents/runtime "com.oracle.java.de.openstreetmap.josm"
+    do_codesign app/JOSM.app/ "de.openstreetmap.josm"
+  fi
 fi
 do_signapp JOSM