diff --git a/ci/generic-build-macos.sh b/ci/generic-build-macos.sh
index ea1b6ee776..41cf953f4c 100755
--- a/ci/generic-build-macos.sh
+++ b/ci/generic-build-macos.sh
@@ -65,6 +65,9 @@ make install
 make install # Dunno why the second is needed but it is, otherwise
              # plugin data is not included in the bundle
 
+# Make sure the code signatures are correct
+codesign --force --deep --sign - /tmp/opencpn/bin/OpenCPN.app
+
 make create-pkg
 if [[ ! -z "${CREATE_DMG+x}" ]]; then
   make create-dmg
diff --git a/ci/universal-build-macos.sh b/ci/universal-build-macos.sh
index 497ca3a662..966afed607 100755
--- a/ci/universal-build-macos.sh
+++ b/ci/universal-build-macos.sh
@@ -114,6 +114,9 @@ make install
 make install # Dunno why the second is needed but it is, otherwise
              # plugin data is not included in the bundle
 
+# Make sure the code signatures are correct
+codesign --force --deep --sign - /tmp/opencpn/bin/OpenCPN.app
+
 dsymutil -o OpenCPN.dSYM /tmp/opencpn/bin/OpenCPN.app/Contents/MacOS/OpenCPN
 tar czf OpenCPN-$(git rev-parse --short HEAD).dSYM.tar.gz OpenCPN.dSYM