diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac9a0c2cd..59866fcc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -322,9 +322,10 @@ if (WIN32)
         DESTINATION ".")
 
 elseif(APPLE)
-    set(CPACK_GENERATOR productbuild)
+    set(CPACK_PACKAGE_NAME      ClamAV)
+    set(CPACK_GENERATOR         productbuild)
     set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}.macos.universal)
-    set(CPACK_PACKAGE_VENDOR "cisco")  # For Apple, creates short name com.cisco.clamav.xxx in pkgutil
+    set(CPACK_PACKAGE_VENDOR    "cisco")  # For Apple, creates short name com.cisco.clamav.xxx in pkgutil
 
     # productbuild requires components or it won't add anything to the PKG
     set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries")
diff --git a/clamav-milter/CMakeLists.txt b/clamav-milter/CMakeLists.txt
index 3e727a85d..2ad08d2a7 100644
--- a/clamav-milter/CMakeLists.txt
+++ b/clamav-milter/CMakeLists.txt
@@ -17,6 +17,14 @@ target_include_directories( clamav-milter
     PRIVATE ${CMAKE_BINARY_DIR} # For clamav-config.h
 )
 set_target_properties( clamav-milter PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
+
+if (APPLE AND CLAMAV_SIGN_FILE)
+    set_target_properties( clamav-milter PROPERTIES
+        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+        XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+    )
+endif()
+
 target_link_libraries( clamav-milter
     PRIVATE
         ClamAV::libclamav
diff --git a/clambc/CMakeLists.txt b/clambc/CMakeLists.txt
index d146c38ba..db461d02c 100644
--- a/clambc/CMakeLists.txt
+++ b/clambc/CMakeLists.txt
@@ -22,6 +22,14 @@ target_include_directories( clambc
     PRIVATE ${CMAKE_BINARY_DIR} # For clamav-config.h
 )
 set_target_properties( clambc PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
+
+if (APPLE AND CLAMAV_SIGN_FILE)
+    set_target_properties( clambc PROPERTIES
+        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+        XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+    )
+endif()
+
 target_link_libraries( clambc
     PRIVATE
         ClamAV::libclamav
diff --git a/clamconf/CMakeLists.txt b/clamconf/CMakeLists.txt
index 0d56cec87..b0b2e5389 100644
--- a/clamconf/CMakeLists.txt
+++ b/clamconf/CMakeLists.txt
@@ -22,6 +22,14 @@ target_include_directories( clamconf
     PRIVATE ${CMAKE_BINARY_DIR} # For clamav-config.h
 )
 set_target_properties( clamconf PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
+
+if (APPLE AND CLAMAV_SIGN_FILE)
+    set_target_properties( clamconf PROPERTIES
+        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+        XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+    )
+endif()
+
 target_link_libraries( clamconf
     PRIVATE
         ClamAV::libclamav
diff --git a/clamd/CMakeLists.txt b/clamd/CMakeLists.txt
index ead283b58..4ed54165b 100644
--- a/clamd/CMakeLists.txt
+++ b/clamd/CMakeLists.txt
@@ -31,8 +31,8 @@ target_sources( clamd
         thrmgr.c
         thrmgr.h )
 if(WIN32)
-    target_sources( clamd 
-    PRIVATE 
+    target_sources( clamd
+    PRIVATE
         ${CMAKE_SOURCE_DIR}/win32/res/clamd.rc
         ${CMAKE_SOURCE_DIR}/win32/res/clam.manifest )
 endif()
@@ -40,6 +40,14 @@ target_include_directories( clamd
     PRIVATE ${CMAKE_BINARY_DIR} # For clamav-config.h
 )
 set_target_properties( clamd PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
+
+if (APPLE AND CLAMAV_SIGN_FILE)
+    set_target_properties( clamd PROPERTIES
+        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+        XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+    )
+endif()
+
 target_link_libraries( clamd
     PRIVATE
         ClamAV::libclamav
diff --git a/clamdscan/CMakeLists.txt b/clamdscan/CMakeLists.txt
index 5c247bffa..9095112c5 100644
--- a/clamdscan/CMakeLists.txt
+++ b/clamdscan/CMakeLists.txt
@@ -20,8 +20,8 @@ target_sources( clamdscan
         proto.c
         proto.h )
 if(WIN32)
-    target_sources( clamdscan 
-    PRIVATE 
+    target_sources( clamdscan
+    PRIVATE
         ${CMAKE_SOURCE_DIR}/win32/res/clamdscan.rc
         ${CMAKE_SOURCE_DIR}/win32/res/clam.manifest )
 endif()
@@ -29,6 +29,14 @@ target_include_directories( clamdscan
     PRIVATE ${CMAKE_BINARY_DIR} # For clamav-config.h
 )
 set_target_properties( clamdscan PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
+
+if (APPLE AND CLAMAV_SIGN_FILE)
+    set_target_properties( clamdscan PROPERTIES
+        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+        XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+    )
+endif()
+
 target_link_libraries( clamdscan
     PRIVATE
         ClamAV::libclamav
diff --git a/clamdtop/CMakeLists.txt b/clamdtop/CMakeLists.txt
index 7a5e23c5c..a70977989 100644
--- a/clamdtop/CMakeLists.txt
+++ b/clamdtop/CMakeLists.txt
@@ -22,6 +22,14 @@ target_include_directories( clamdtop
     PRIVATE ${CMAKE_BINARY_DIR} # For clamav-config.h
 )
 set_target_properties( clamdtop PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
+
+if (APPLE AND CLAMAV_SIGN_FILE)
+    set_target_properties( clamdtop PROPERTIES
+        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+        XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+    )
+endif()
+
 target_link_libraries( clamdtop
     PRIVATE
         ClamAV::libclamav
diff --git a/clamonacc/CMakeLists.txt b/clamonacc/CMakeLists.txt
index e52e93495..e95e6d03f 100644
--- a/clamonacc/CMakeLists.txt
+++ b/clamonacc/CMakeLists.txt
@@ -44,6 +44,7 @@ target_include_directories( clamonacc
 )
 
 set_target_properties( clamonacc PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
+
 target_link_libraries( clamonacc
     PRIVATE
         ClamAV::libclamav
diff --git a/clamscan/CMakeLists.txt b/clamscan/CMakeLists.txt
index 748eeddfd..8db0ece78 100644
--- a/clamscan/CMakeLists.txt
+++ b/clamscan/CMakeLists.txt
@@ -19,15 +19,23 @@ target_sources( clamscan
         manager.h
         global.h )
 if(WIN32)
-    target_sources( clamscan 
-    PRIVATE 
-        ${CMAKE_SOURCE_DIR}/win32/res/clamscan.rc 
+    target_sources( clamscan
+    PRIVATE
+        ${CMAKE_SOURCE_DIR}/win32/res/clamscan.rc
         ${CMAKE_SOURCE_DIR}/win32/res/clam.manifest )
 endif()
 target_include_directories( clamscan
     PRIVATE ${CMAKE_BINARY_DIR} # For clamav-config.h
 )
 set_target_properties( clamscan PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
+
+if (APPLE AND CLAMAV_SIGN_FILE)
+    set_target_properties( clamscan PROPERTIES
+        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+        XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+    )
+endif()
+
 target_link_libraries( clamscan
     PRIVATE
         ClamAV::libclamav
diff --git a/clamsubmit/CMakeLists.txt b/clamsubmit/CMakeLists.txt
index 12ca1f6dd..6379d39bb 100644
--- a/clamsubmit/CMakeLists.txt
+++ b/clamsubmit/CMakeLists.txt
@@ -22,6 +22,14 @@ target_include_directories( clamsubmit
     PRIVATE ${CMAKE_BINARY_DIR} # For clamav-config.h
 )
 set_target_properties( clamsubmit PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
+
+if (APPLE AND CLAMAV_SIGN_FILE)
+    set_target_properties( clamscan PROPERTIES
+        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+        XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+    )
+endif()
+
 target_link_libraries( clamsubmit
     PRIVATE
         ClamAV::libclamav
diff --git a/freshclam/CMakeLists.txt b/freshclam/CMakeLists.txt
index 5ce5919c9..1cc1cb938 100644
--- a/freshclam/CMakeLists.txt
+++ b/freshclam/CMakeLists.txt
@@ -20,12 +20,20 @@ target_sources( freshclam-bin
         notify.c
         notify.h )
 if(WIN32)
-    target_sources( freshclam-bin 
-        PRIVATE 
+    target_sources( freshclam-bin
+        PRIVATE
             ${CMAKE_SOURCE_DIR}/win32/res/freshclam.rc
             ${CMAKE_SOURCE_DIR}/win32/res/clam.manifest )
 endif()
 set_target_properties( freshclam-bin PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
+
+if (APPLE AND CLAMAV_SIGN_FILE)
+    set_target_properties( freshclam-bin PROPERTIES
+        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+        XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+    )
+endif()
+
 target_link_libraries(freshclam-bin
     PRIVATE
         ClamAV::libfreshclam
diff --git a/libclamav/CMakeLists.txt b/libclamav/CMakeLists.txt
index e8df0bb4c..db8991414 100644
--- a/libclamav/CMakeLists.txt
+++ b/libclamav/CMakeLists.txt
@@ -546,6 +546,14 @@ if(ENABLE_SHARED_LIB)
     set_target_properties( clamav PROPERTIES
         COMPILE_FLAGS "${WARNCFLAGS}"
         VERSION ${LIBCLAMAV_VERSION} SOVERSION ${LIBCLAMAV_SOVERSION} )
+
+    if (APPLE AND CLAMAV_SIGN_FILE)
+        set_target_properties( clamav PROPERTIES
+            XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+            XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+        )
+    endif()
+
     if(WIN32)
         set_target_properties( clamav PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
     else()
diff --git a/libclammspack/CMakeLists.txt b/libclammspack/CMakeLists.txt
index e34e1db37..4d2c6f418 100644
--- a/libclammspack/CMakeLists.txt
+++ b/libclammspack/CMakeLists.txt
@@ -72,6 +72,13 @@ if(ENABLE_SHARED_LIB)
             ${CMAKE_CURRENT_BINARY_DIR}
         PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/mspack )
 
+    if (APPLE AND CLAMAV_SIGN_FILE)
+        set_target_properties( clammspack PROPERTIES
+            XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+            XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+        )
+    endif()
+
     if(WIN32)
         install(TARGETS clammspack DESTINATION . COMPONENT libraries)
     else()
diff --git a/libclamunrar/CMakeLists.txt b/libclamunrar/CMakeLists.txt
index ec1893de6..5cacd5f31 100644
--- a/libclamunrar/CMakeLists.txt
+++ b/libclamunrar/CMakeLists.txt
@@ -84,6 +84,13 @@ if(ENABLE_SHARED_LIB)
             COMPILE_FLAGS "-Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else")
     endif()
 
+    if (APPLE AND CLAMAV_SIGN_FILE)
+        set_target_properties( clamunrar PROPERTIES
+            XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+            XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+        )
+    endif()
+
     if(WIN32)
         set_target_properties(clamunrar PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
     endif()
diff --git a/libclamunrar_iface/CMakeLists.txt b/libclamunrar_iface/CMakeLists.txt
index 094562597..330945e9d 100644
--- a/libclamunrar_iface/CMakeLists.txt
+++ b/libclamunrar_iface/CMakeLists.txt
@@ -53,6 +53,13 @@ if(ENABLE_UNRAR)
         set_target_properties( clamunrar_iface PROPERTIES
             COMPILE_FLAGS "${WARNCXXFLAGS} ${CXX1XCXXFLAGS}" )
 
+        if (APPLE AND CLAMAV_SIGN_FILE)
+            set_target_properties( clamunrar_iface PROPERTIES
+                XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+                XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+            )
+        endif()
+
         if(WIN32)
             set_target_properties(clamunrar_iface PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
         endif()
diff --git a/sigtool/CMakeLists.txt b/sigtool/CMakeLists.txt
index a4161a4b1..b4292c5c0 100644
--- a/sigtool/CMakeLists.txt
+++ b/sigtool/CMakeLists.txt
@@ -26,6 +26,14 @@ target_include_directories( sigtool
 )
 
 set_target_properties( sigtool PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
+
+if (APPLE AND CLAMAV_SIGN_FILE)
+    set_target_properties( sigtool PROPERTIES
+        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY}
+        XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
+    )
+endif()
+
 target_link_libraries( sigtool
     PRIVATE
         ClamAV::libclamav