diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea95d818c..f2739c4da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -252,6 +252,12 @@ if(DEFINED LENSFUNDBDIR AND NOT IS_ABSOLUTE "${LENSFUNDBDIR}")
     set(LENSFUNDBDIR "${DATADIR}/${LENSFUNDBDIR}")
 endif()
 
+if(APPLE)
+    if("${CODESIGNID}")
+        set(CODESIGNID "${CODESIGNID}" CACHE STRING "Codesigning Identity")
+    endif()
+endif()
+
 # Enforce absolute paths for non-bundle builds:
 if(NOT BUILD_BUNDLE)
     foreach(path BINDIR DATADIR LIBDIR DOCDIR CREDITSDIR LICENCEDIR)
diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh
index 591699cbb..e5c9d0bd3 100644
--- a/tools/osx/macosx_bundle.sh
+++ b/tools/osx/macosx_bundle.sh
@@ -199,8 +199,11 @@ s|@arch@|${arch}|" \
     "${CONTENTS}/Info.plist"
 plutil -convert binary1 "${CONTENTS}/Info.plist"
 
-
-
+# Sign the app
+CODESIGNID="$(cmake .. -LA -N | grep "CODESIGNID" | cut -d "=" -f2)"
+codesign --deep --force -v -s "${CODESIGNID}"  "${APP}"
+spctl -a -vvvv "${APP}"
+ 
 function CreateDmg {
     local srcDir="$(mktemp -dt $$)"
 
@@ -227,6 +230,9 @@ function CreateDmg {
     msg "Creating disk image:"
     hdiutil create -format UDBZ -srcdir "${srcDir}" -volname "${PROJECT_NAME}_${PROJECT_FULL_VERSION}" "${dmg_name}.dmg"
 
+    # Sign disk image
+    codesign --deep --force -v -s "${CODESIGNID}" "${dmg_name}.dmg"
+
     # Zip disk image for redistribution
     zip "${dmg_name}.zip" "${dmg_name}.dmg" AboutThisBuild.txt
     rm "${dmg_name}.dmg"