diff --git a/build/bakefiles/mac_bundles.bkl b/build/bakefiles/mac_bundles.bkl
index 1478ab9c64..7301f9e972 100644
--- a/build/bakefiles/mac_bundles.bkl
+++ b/build/bakefiles/mac_bundles.bkl
@@ -6,14 +6,6 @@
     Support for application bundles, for wxWidgets samples.
     -->
 
-    <!--
-    Nasty hack: use $(srcdir) to obtain usable CFBundleIdentifier suffix;
-    converts $(srcdir) like "../../samples/minimal" to "samples.minimal".
-    -->
-    <set var="BUNDLE_IDENTIFIER">
-        `echo $(DOLLAR)(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`
-    </set>
-
     <set var="BUNDLE_PLIST" overwrite="0">
         $(TOP_SRCDIR)src/osx/carbon/Info.plist.in
     </set>
@@ -54,9 +46,14 @@
                 mkdir -p $(BUNDLE)/Resources
 
                 <!-- Info.plist: -->
-                sed -e "s/IDENTIFIER/$(BUNDLE_IDENTIFIER)/" \
-                    -e "s/EXECUTABLE/$(id)/" \
-                    -e "s/VERSION/$(WX_VERSION)/" \
+                sed -e "s/\$(DOLLAR)$(DOLLAR){MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.$(id)/" \
+                    -e "s/\$(DOLLAR)$(DOLLAR){MACOSX_BUNDLE_EXECUTABLE_NAME}/$(id)/" \
+                    -e "s/\$(DOLLAR)$(DOLLAR){MACOSX_BUNDLE_BUNDLE_NAME}/$(id)/" \
+                    -e "s/\$(DOLLAR)$(DOLLAR){MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+                    -e "s/\$(DOLLAR)$(DOLLAR){MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+                    -e "s/\$(DOLLAR)$(DOLLAR){MACOSX_BUNDLE_INFO_STRING}/$(id) version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+                    -e "s/\$(DOLLAR)$(DOLLAR){MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+                    -e "s/\$(DOLLAR)$(DOLLAR){MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
                     $(BUNDLE_PLIST) >$(BUNDLE)/Info.plist
 
                 <!-- PkgInfo: -->
diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in
index 2b7120d60e..b46419d122 100644
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -163,9 +163,14 @@ bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p bombs.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/bombs/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.bombs/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/bombs/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/bombs/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/bombs version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >bombs.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in
index 15ee7f9810..95b55f0f8f 100644
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -175,9 +175,14 @@ forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p forty.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/forty/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.forty/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/forty/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/forty/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/forty version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >forty.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in
index e4c0febfae..325a33f21a 100644
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -161,9 +161,14 @@ fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p fractal.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/fractal/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.fractal/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/fractal/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/fractal/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/fractal version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >fractal.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in
index e81d0b2151..5a85d59b6b 100644
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -164,9 +164,14 @@ life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p life.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/life/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.life/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/life/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/life/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/life version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >life.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in
index 7386c2ca3c..bc7fb90d14 100644
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -165,9 +165,14 @@ wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p wxpoem.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/wxpoem/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.wxpoem/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/wxpoem/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/wxpoem/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/wxpoem version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >wxpoem.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/misc/scripts/inc_year b/misc/scripts/inc_year
index 3a36155e80..aac5fb0ee4 100755
--- a/misc/scripts/inc_year
+++ b/misc/scripts/inc_year
@@ -27,9 +27,5 @@ run_sed src/msw/version.rc "s/1993-$old_year/1993-$new_year/"
 run_sed src/common/utilscmn.cpp "s/1995-$old_year/1995-$new_year/"
 
 # And Mac files are much newer than that.
-for f in samples/docview/Info.plist.in \
-         samples/minimal/Info_cocoa.plist \
-         src/osx/carbon/Info.plist.in \
-         ; do
-    run_sed $f "s/200[25]-$old_year/200[25]-$new_year/"
-done
+run_set build/bakefiles/mac_bundles.bkl "s/2002-$old_year/2002-$new_year/"
+run_sed samples/minimal/Info_cocoa.plist "s/2005-$old_year/2005-$new_year/"
diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index 76f9c59f64..33eec97fad 100644
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -161,9 +161,14 @@ accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p accesstest.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/accesstest/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.accesstest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/accesstest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/accesstest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/accesstest version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >accesstest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in
index 880065dc7d..e4ed402630 100644
--- a/samples/animate/Makefile.in
+++ b/samples/animate/Makefile.in
@@ -161,9 +161,14 @@ anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p anitest.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/anitest/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.anitest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/anitest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/anitest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/anitest version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >anitest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index e3593fefdd..33eaca1c82 100644
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -162,9 +162,14 @@ arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p arttest.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/arttest/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.arttest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/arttest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/arttest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/arttest version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >arttest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in
index 9faa21146d..11c18c5560 100644
--- a/samples/aui/Makefile.in
+++ b/samples/aui/Makefile.in
@@ -171,9 +171,14 @@ auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p auidemo.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/auidemo/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.auidemo/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/auidemo/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/auidemo/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/auidemo version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >auidemo.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index d9f830bd9c..9cff82e528 100644
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -161,9 +161,14 @@ calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p calendar.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/calendar/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.calendar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/calendar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/calendar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/calendar version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >calendar.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index 864afddc3d..f3ffcf6749 100644
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -161,9 +161,14 @@ caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p caret.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/caret/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.caret/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/caret/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/caret/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/caret version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >caret.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in
index 31b18fe0d1..f0e5eea74e 100644
--- a/samples/clipboard/Makefile.in
+++ b/samples/clipboard/Makefile.in
@@ -161,9 +161,14 @@ clipboard$(EXEEXT): $(CLIPBOARD_OBJECTS) $(__clipboard___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p clipboard.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/clipboard/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.clipboard/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/clipboard/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/clipboard/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/clipboard version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >clipboard.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in
index d87de1ef85..f15f712bba 100644
--- a/samples/collpane/Makefile.in
+++ b/samples/collpane/Makefile.in
@@ -161,9 +161,14 @@ collpane$(EXEEXT): $(COLLPANE_OBJECTS) $(__collpane___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p collpane.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/collpane/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.collpane/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/collpane/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/collpane/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/collpane version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >collpane.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in
index 7ba2d9e4bb..4e213467cc 100644
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -161,9 +161,14 @@ combo$(EXEEXT): $(COMBO_OBJECTS) $(__combo___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p combo.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/combo/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.combo/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/combo/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/combo/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/combo version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >combo.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index 68fe9ecd8b..234ff11fb1 100644
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -161,9 +161,14 @@ conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p conftest.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/conftest/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.conftest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/conftest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/conftest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/conftest version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >conftest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in
index 32beff6c33..0d8e8bf52e 100644
--- a/samples/dataview/Makefile.in
+++ b/samples/dataview/Makefile.in
@@ -162,9 +162,14 @@ dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p dataview.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/dataview/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.dataview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/dataview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/dataview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/dataview version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >dataview.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in
index fbc84bc60c..fa70172090 100644
--- a/samples/debugrpt/Makefile.in
+++ b/samples/debugrpt/Makefile.in
@@ -167,9 +167,14 @@ debugrpt$(EXEEXT): $(DEBUGRPT_OBJECTS) $(__debugrpt___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p debugrpt.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/debugrpt/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.debugrpt/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/debugrpt/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/debugrpt/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/debugrpt version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >debugrpt.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index d190c5d71b..370a888222 100644
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -170,9 +170,14 @@ dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p dialogs.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/dialogs/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.dialogs/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/dialogs/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/dialogs/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/dialogs version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >dialogs.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index 8d69ecc58d..f6e9b80c6f 100644
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -161,9 +161,14 @@ nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p nettest.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/nettest/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.nettest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/nettest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/nettest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/nettest version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >nettest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index 730f33f522..eb3d674b34 100644
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -161,9 +161,14 @@ display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p display.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/display/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.display/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/display/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/display/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/display version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >display.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/dll/Makefile.in b/samples/dll/Makefile.in
index 4b7b16cd44..aee69ed523 100644
--- a/samples/dll/Makefile.in
+++ b/samples/dll/Makefile.in
@@ -194,9 +194,14 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	mkdir -p wx_exe.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	
-@COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	-e "s/EXECUTABLE/wx_exe/" \
-@COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.wx_exe/" \
+@COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/wx_exe/" \
+@COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/wx_exe/" \
+@COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/wx_exe version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	$(top_srcdir)/src/osx/carbon/Info.plist.in >wx_exe.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@	
diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index 2c768b8ae2..2bcbc60644 100644
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -161,9 +161,14 @@ dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p dnd.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/dnd/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.dnd/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/dnd/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/dnd/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/dnd version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >dnd.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/docview/Info.plist.in b/samples/docview/Info.plist.in
index a620e3c5cd..cbdb32a09a 100644
--- a/samples/docview/Info.plist.in
+++ b/samples/docview/Info.plist.in
@@ -49,13 +49,13 @@
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
-	<string>EXECUTABLE</string>
+	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>EXECUTABLE version VERSION, (c) 2002-2021 wxWidgets</string>
+	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
 	<key>CFBundleIconFile</key>
 	<string>wxmac.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.wxwindows.IDENTIFIER</string>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLocalizations</key>
@@ -66,17 +66,17 @@
 		<string>it</string>
 	</array>
 	<key>CFBundleLongVersionString</key>
-	<string>VERSION, (c) 2002-2021 wxWidgets</string>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
 	<key>CFBundleName</key>
-	<string>EXECUTABLE</string>
+	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>VERSION</string>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
 	<key>CFBundleVersion</key>
-	<string>VERSION</string>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2002-2021 wxWidgets</string>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
 	<key>NSPrincipalClass</key>
 	<string>wxNSApplication</string>
 </dict>
diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index 5c8dd425da..efd313e043 100644
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -166,9 +166,14 @@ docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p docview.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/docview/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.docview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/docview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/docview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/docview version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(srcdir)/Info.plist.in >docview.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in
index de0be7851c..0b6bdbe20d 100644
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -161,9 +161,14 @@ dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p dragimag.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/dragimag/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.dragimag/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/dragimag/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/dragimag/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/dragimag version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >dragimag.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index fe123b92b9..7ca1611f2d 100644
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -161,9 +161,14 @@ drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p drawing.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/drawing/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.drawing/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/drawing/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/drawing/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/drawing version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >drawing.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index f28d2f0091..73ad030b1c 100644
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -161,9 +161,14 @@ erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p erase.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/erase/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.erase/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/erase/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/erase/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/erase version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >erase.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in
index 6c3d2cc675..4ee72aa16f 100644
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -163,9 +163,14 @@ event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p event.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/event/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.event/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/event/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/event/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/event version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >event.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in
index 11005ef938..73de2cb196 100644
--- a/samples/except/Makefile.in
+++ b/samples/except/Makefile.in
@@ -161,9 +161,14 @@ except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p except.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/except/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.except/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/except/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/except/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/except version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >except.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in
index 447b096c53..67334fb441 100644
--- a/samples/exec/Makefile.in
+++ b/samples/exec/Makefile.in
@@ -161,9 +161,14 @@ exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p exec.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/exec/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.exec/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/exec/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/exec/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/exec version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >exec.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index e9bc554463..afa8c9588a 100644
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -161,9 +161,14 @@ font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p font.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/font/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.font/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/font/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/font/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/font version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >font.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/fswatcher/Makefile.in b/samples/fswatcher/Makefile.in
index 35e99a69e2..7fb1cab393 100644
--- a/samples/fswatcher/Makefile.in
+++ b/samples/fswatcher/Makefile.in
@@ -161,9 +161,14 @@ fswatcher$(EXEEXT): $(FSWATCHER_OBJECTS) $(__fswatcher___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p fswatcher.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/fswatcher/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.fswatcher/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/fswatcher/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/fswatcher/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/fswatcher version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >fswatcher.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index 230028af60..0fd4b01a17 100644
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -161,9 +161,14 @@ grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p grid.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/grid/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.grid/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/grid/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/grid/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/grid version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >grid.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index f143169006..f2e1e34c6c 100644
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -165,9 +165,14 @@ help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p help.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/help/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.help/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/help/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/help/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/help version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >help.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index d20e6ae0fd..c72c0ead51 100644
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -165,9 +165,14 @@ htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p htlbox.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/htlbox/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.htlbox/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/htlbox/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/htlbox/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/htlbox version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >htlbox.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index f092cfeb4e..6a254a5416 100644
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -166,9 +166,14 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p about.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/about/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.about/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/about/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/about/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/about version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >about.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index 0089eb1b44..4f97bc3f2b 100644
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -166,9 +166,14 @@ htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p htmlhelp.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/htmlhelp/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.htmlhelp/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/htmlhelp/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/htmlhelp/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/htmlhelp version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >htmlhelp.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index 4b7c9f8f63..4e1e57ad34 100644
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -166,9 +166,14 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p helpview.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/helpview/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.helpview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/helpview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/helpview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/helpview version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >helpview.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index 55615890a9..f9e1159702 100644
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -171,9 +171,14 @@ htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p htmlprinting.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/htmlprinting/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.htmlprinting/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/htmlprinting/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/htmlprinting/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/htmlprinting version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >htmlprinting.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index 1ba5286ae7..06d25ff0b1 100644
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -169,9 +169,14 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p test.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/test/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.test/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/test/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/test/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/test version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >test.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index e437d289c4..e941854228 100644
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -166,9 +166,14 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p virtual.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/virtual/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.virtual/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/virtual/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/virtual/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/virtual version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >virtual.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index 2914a73d43..3e5a8b75c0 100644
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -166,9 +166,14 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p widget.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/widget/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.widget/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/widget/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/widget/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/widget version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >widget.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index 0e5dd81a73..025e3c103c 100644
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -166,9 +166,14 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p zip.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/zip/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.zip/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/zip/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/zip/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/zip version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >zip.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index b6307bfc37..8a4593f697 100644
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -162,9 +162,14 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p image.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/image/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.image/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/image/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/image/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/image version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >image.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index aefb651bb3..9d36a6336e 100644
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -161,9 +161,14 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p internat.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/internat/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.internat/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/internat/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/internat/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/internat version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >internat.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index 6305ed1f96..c697882122 100644
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -210,9 +210,14 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p ipcclient.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/EXECUTABLE/ipcclient/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.ipcclient/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/ipcclient/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/ipcclient/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/ipcclient version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >ipcclient.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
@@ -236,9 +241,14 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p ipcserver.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/EXECUTABLE/ipcserver/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.ipcserver/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/ipcserver/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/ipcserver/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/ipcserver version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >ipcserver.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index cc484de196..198cf562a5 100644
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -161,9 +161,14 @@ joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p joytest.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/joytest/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.joytest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/joytest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/joytest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/joytest version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >joytest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index 263667abbb..142e886ef9 100644
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -161,9 +161,14 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p keyboard.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/keyboard/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.keyboard/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/keyboard/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/keyboard/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/keyboard version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >keyboard.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index 1658b6dc2b..0c0ab29a29 100644
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -161,9 +161,14 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p layout.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/layout/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.layout/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/layout/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/layout/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/layout version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >layout.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
index 76efc4eda8..f6f14a4b31 100644
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -161,9 +161,14 @@ listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p listctrl.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/listctrl/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.listctrl/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/listctrl/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/listctrl/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/listctrl version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >listctrl.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index 08017a2593..2ba0a9ceb3 100644
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -161,9 +161,14 @@ mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p mdi.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/mdi/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.mdi/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/mdi/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/mdi/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/mdi version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >mdi.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index 3a715592bb..1116c791f0 100644
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -168,9 +168,14 @@ mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p mediaplayer.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/mediaplayer/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.mediaplayer/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/mediaplayer/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/mediaplayer/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/mediaplayer version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >mediaplayer.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index 2487ed286e..6ccfe870ed 100644
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -161,9 +161,14 @@ memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p memcheck.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/memcheck/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.memcheck/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/memcheck/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/memcheck/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/memcheck version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >memcheck.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index 5cb79d6551..92cc17ab3a 100644
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -161,9 +161,14 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p menu.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/menu/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.menu/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/menu/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/menu/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/menu version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >menu.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 353d3f69f9..3a5c1e91b3 100644
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -161,9 +161,14 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p minimal.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/minimal/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.minimal/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/minimal/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/minimal/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/minimal version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >minimal.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in
index 94a13e5154..8533071e01 100644
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -161,9 +161,14 @@ nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p nativdlg.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/nativdlg/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.nativdlg/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/nativdlg/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/nativdlg/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/nativdlg version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >nativdlg.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index 3c43359d16..369c03e78b 100644
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -164,9 +164,14 @@ notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p notebook.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/notebook/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.notebook/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/notebook/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/notebook/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/notebook version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >notebook.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in
index e854014e17..c87681e4f4 100644
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -161,9 +161,14 @@ oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p oleauto.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/oleauto/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.oleauto/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/oleauto/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/oleauto/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/oleauto version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >oleauto.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index 54eab34b30..6160cb4444 100644
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -164,9 +164,14 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	mkdir -p cube.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
-@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/EXECUTABLE/cube/" \
-@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.cube/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/cube/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/cube/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/cube version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >cube.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in
index d912bd889a..042c524464 100644
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -165,9 +165,14 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	mkdir -p isosurf.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
-@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/EXECUTABLE/isosurf/" \
-@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.isosurf/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/isosurf/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/isosurf/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/isosurf version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >isosurf.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 0254fb6fc8..68cd90fe8d 100644
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -176,9 +176,14 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	mkdir -p penguin.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
-@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/EXECUTABLE/penguin/" \
-@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.penguin/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/penguin/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/penguin/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/penguin version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >penguin.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
diff --git a/samples/opengl/pyramid/Makefile.in b/samples/opengl/pyramid/Makefile.in
index 986082cf41..443281ddcb 100644
--- a/samples/opengl/pyramid/Makefile.in
+++ b/samples/opengl/pyramid/Makefile.in
@@ -168,9 +168,14 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	mkdir -p pyramid.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
-@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/EXECUTABLE/pyramid/" \
-@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.pyramid/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/pyramid/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/pyramid/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/pyramid version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >pyramid.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in
index e64b8f2232..f5df3e311d 100644
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -161,9 +161,14 @@ ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p ownerdrw.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/ownerdrw/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.ownerdrw/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/ownerdrw/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/ownerdrw/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/ownerdrw version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >ownerdrw.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in
index 7f1f2ddff0..401aac7d69 100644
--- a/samples/popup/Makefile.in
+++ b/samples/popup/Makefile.in
@@ -161,9 +161,14 @@ popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p popup.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/popup/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.popup/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/popup/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/popup/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/popup version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >popup.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in
index 9b4c876268..2a9bc87e55 100644
--- a/samples/power/Makefile.in
+++ b/samples/power/Makefile.in
@@ -161,9 +161,14 @@ power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p power.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/power/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.power/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/power/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/power/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/power version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >power.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/preferences/Makefile.in b/samples/preferences/Makefile.in
index 251d635537..7c13aa0837 100644
--- a/samples/preferences/Makefile.in
+++ b/samples/preferences/Makefile.in
@@ -164,9 +164,14 @@ preferences$(EXEEXT): $(PREFERENCES_OBJECTS) $(__preferences___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p preferences.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/preferences/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.preferences/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/preferences/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/preferences/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/preferences version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >preferences.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index a3e76a00ea..758679fd37 100644
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -161,9 +161,14 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p printing.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/printing/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.printing/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/printing/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/printing/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/printing version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >printing.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in
index 2522b36b4c..4ad8d12b00 100644
--- a/samples/propgrid/Makefile.in
+++ b/samples/propgrid/Makefile.in
@@ -167,9 +167,14 @@ propgrid$(EXEEXT): $(PROPGRID_OBJECTS) $(__propgrid___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p propgrid.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/propgrid/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.propgrid/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/propgrid/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/propgrid/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/propgrid version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >propgrid.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in
index 3ba3e0007e..bd445ca650 100644
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -161,9 +161,14 @@ regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p regtest.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/regtest/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.regtest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/regtest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/regtest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/regtest version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >regtest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in
index d5be099751..185f78888f 100644
--- a/samples/render/Makefile.in
+++ b/samples/render/Makefile.in
@@ -195,9 +195,14 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p render.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/render/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.render/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/render/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/render/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/render version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >render.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/ribbon/Makefile.in b/samples/ribbon/Makefile.in
index 94f825cb62..d479404b05 100644
--- a/samples/ribbon/Makefile.in
+++ b/samples/ribbon/Makefile.in
@@ -164,9 +164,14 @@ ribbon$(EXEEXT): $(RIBBON_OBJECTS) $(__ribbon___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p ribbon.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/ribbon/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.ribbon/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/ribbon/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/ribbon/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/ribbon version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >ribbon.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in
index ea4813446f..2d68f3cb3a 100644
--- a/samples/richtext/Makefile.in
+++ b/samples/richtext/Makefile.in
@@ -171,9 +171,14 @@ richtext$(EXEEXT): $(RICHTEXT_OBJECTS) $(__richtext___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p richtext.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/richtext/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.richtext/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/richtext/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/richtext/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/richtext version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >richtext.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in
index 27344d0b1d..bd0be46a4b 100644
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -161,9 +161,14 @@ sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p sashtest.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/sashtest/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.sashtest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/sashtest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/sashtest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/sashtest version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >sashtest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
index c73dafb8d1..bc00aa67b6 100644
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -161,9 +161,14 @@ scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p scroll.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/scroll/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.scroll/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/scroll/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/scroll/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/scroll version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >scroll.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index dd16396f92..f2746a84a1 100644
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -161,9 +161,14 @@ shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p shaped.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/shaped/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.shaped/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/shaped/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/shaped/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/shaped version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >shaped.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index aa03431c53..eef50add59 100644
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -208,9 +208,14 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p client.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/EXECUTABLE/client/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.client/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/client/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/client/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/client version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >client.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
@@ -234,9 +239,14 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p server.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/EXECUTABLE/server/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.server/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/server/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/server/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/server version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >server.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in
index a0204d5e63..4492edc39d 100644
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -161,9 +161,14 @@ sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p sound.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/sound/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.sound/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/sound/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/sound/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/sound version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >sound.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in
index 7c21ab6e6b..11f9cda77c 100644
--- a/samples/splash/Makefile.in
+++ b/samples/splash/Makefile.in
@@ -165,9 +165,14 @@ splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p splash.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/splash/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.splash/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/splash/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/splash/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/splash version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >splash.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index 36d765a48b..2367f7afa8 100644
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -161,9 +161,14 @@ splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p splitter.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/splitter/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.splitter/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/splitter/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/splitter/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/splitter version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >splitter.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in
index 3016def991..8f2b71d880 100644
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -161,9 +161,14 @@ statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p statbar.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/statbar/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.statbar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/statbar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/statbar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/statbar version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >statbar.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
index 19875abe76..578fface82 100644
--- a/samples/stc/Makefile.in
+++ b/samples/stc/Makefile.in
@@ -167,9 +167,14 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p stctest.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/stctest/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.stctest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/stctest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/stctest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/stctest version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >stctest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in
index 8fd09a282d..35bb870d99 100644
--- a/samples/svg/Makefile.in
+++ b/samples/svg/Makefile.in
@@ -161,9 +161,14 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p svgtest.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/svgtest/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.svgtest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/svgtest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/svgtest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/svgtest version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >svgtest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/taborder/Makefile.in b/samples/taborder/Makefile.in
index 1a4d533358..84197da86d 100644
--- a/samples/taborder/Makefile.in
+++ b/samples/taborder/Makefile.in
@@ -161,9 +161,14 @@ taborder$(EXEEXT): $(TABORDER_OBJECTS) $(__taborder___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p taborder.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/taborder/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.taborder/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/taborder/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/taborder/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/taborder version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >taborder.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in
index 1217ca5caa..f1239aea86 100644
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -161,9 +161,14 @@ taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p taskbar.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/taskbar/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.taskbar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/taskbar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/taskbar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/taskbar version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >taskbar.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/taskbarbutton/Makefile.in b/samples/taskbarbutton/Makefile.in
index 677b933946..09c54f7e88 100644
--- a/samples/taskbarbutton/Makefile.in
+++ b/samples/taskbarbutton/Makefile.in
@@ -168,9 +168,14 @@ taskbarbutton$(EXEEXT): $(TASKBARBUTTON_OBJECTS) $(__taskbarbutton___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p taskbarbutton.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/taskbarbutton/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.taskbarbutton/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/taskbarbutton/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/taskbarbutton/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/taskbarbutton version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >taskbarbutton.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
index c175bb8040..1604e2c750 100644
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -161,9 +161,14 @@ text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p text.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/text/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.text/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/text/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/text/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/text version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >text.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index 7e21ed8313..034f3605b0 100644
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -161,9 +161,14 @@ thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p thread.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/thread/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.thread/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/thread/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/thread/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/thread version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >thread.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index f3f1b0fe6a..a5608b2664 100644
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -161,9 +161,14 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p toolbar.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/toolbar/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.toolbar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/toolbar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/toolbar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/toolbar version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >toolbar.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index e2f9d3127b..16372382d2 100644
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -161,9 +161,14 @@ treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p treectrl.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/treectrl/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.treectrl/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/treectrl/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/treectrl/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/treectrl version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >treectrl.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/treelist/Makefile.in b/samples/treelist/Makefile.in
index d96bd44f54..2eeb78e128 100644
--- a/samples/treelist/Makefile.in
+++ b/samples/treelist/Makefile.in
@@ -161,9 +161,14 @@ treelist$(EXEEXT): $(TREELIST_OBJECTS) $(__treelist___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p treelist.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/treelist/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.treelist/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/treelist/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/treelist/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/treelist version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >treelist.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
index 48a654f4f6..87ca032bcb 100644
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -161,9 +161,14 @@ typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p typetest.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/typetest/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.typetest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/typetest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/typetest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/typetest version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >typetest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/uiaction/Makefile.in b/samples/uiaction/Makefile.in
index cf7f747520..8714011f81 100644
--- a/samples/uiaction/Makefile.in
+++ b/samples/uiaction/Makefile.in
@@ -161,9 +161,14 @@ uiaction$(EXEEXT): $(UIACTION_OBJECTS) $(__uiaction___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p uiaction.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/uiaction/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.uiaction/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/uiaction/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/uiaction/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/uiaction version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >uiaction.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in
index e5d402c8fe..637339f22a 100644
--- a/samples/validate/Makefile.in
+++ b/samples/validate/Makefile.in
@@ -161,9 +161,14 @@ validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p validate.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/validate/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.validate/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/validate/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/validate/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/validate version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >validate.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index 95a7653659..b6d6cdadb3 100644
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -161,9 +161,14 @@ vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p vstest.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/vstest/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.vstest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/vstest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/vstest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/vstest version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >vstest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/webrequest/Makefile.in b/samples/webrequest/Makefile.in
index 29eba32577..aa774a83dc 100644
--- a/samples/webrequest/Makefile.in
+++ b/samples/webrequest/Makefile.in
@@ -164,9 +164,14 @@ webrequest$(EXEEXT): $(WEBREQUEST_OBJECTS) $(__webrequest___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p webrequest.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/webrequest/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.webrequest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/webrequest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/webrequest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/webrequest version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >webrequest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/webview/Makefile.in b/samples/webview/Makefile.in
index 4b5d475e05..6d1ac55f84 100644
--- a/samples/webview/Makefile.in
+++ b/samples/webview/Makefile.in
@@ -169,9 +169,14 @@ webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p webview.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/webview/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.webview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/webview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/webview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/webview version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >webview.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in
index 0d1ba181c3..d38c57f68a 100644
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -200,9 +200,14 @@ widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p widgets.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/widgets/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.widgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/widgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/widgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/widgets version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >widgets.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index 8388621570..5c11dc06fc 100644
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -161,9 +161,14 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p wizard.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/wizard/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.wizard/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/wizard/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/wizard/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/wizard version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >wizard.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in
index 9061250adf..ce88c903bf 100644
--- a/samples/wrapsizer/Makefile.in
+++ b/samples/wrapsizer/Makefile.in
@@ -161,9 +161,14 @@ wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p wrapsizer.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/wrapsizer/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.wrapsizer/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/wrapsizer/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/wrapsizer/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/wrapsizer version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >wrapsizer.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index 6a80916fd4..1bad4e3c0d 100644
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -181,9 +181,14 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p xrcdemo.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/xrcdemo/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.xrcdemo/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/xrcdemo/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/xrcdemo/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/xrcdemo version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >xrcdemo.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/samples/xti/Makefile.in b/samples/xti/Makefile.in
index 23d9151c8e..d712d0bd24 100644
--- a/samples/xti/Makefile.in
+++ b/samples/xti/Makefile.in
@@ -166,9 +166,14 @@ xti$(EXEEXT): $(XTI_OBJECTS) $(__xti___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p xti.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/xti/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.xti/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/xti/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/xti/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/xti version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >xti.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/src/osx/carbon/Info.plist.in b/src/osx/carbon/Info.plist.in
index bd9a4a014f..bbf00f1257 100644
--- a/src/osx/carbon/Info.plist.in
+++ b/src/osx/carbon/Info.plist.in
@@ -5,13 +5,13 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>EXECUTABLE</string>
+	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>EXECUTABLE version VERSION, (c) 2002-2021 wxWidgets</string>
+	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
 	<key>CFBundleIconFile</key>
 	<string>wxmac.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.wxwindows.IDENTIFIER</string>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLocalizations</key>
@@ -22,17 +22,17 @@
 		<string>it</string>
 	</array>
 	<key>CFBundleLongVersionString</key>
-	<string>VERSION, (c) 2002-2021 wxWidgets</string>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
 	<key>CFBundleName</key>
-	<string>EXECUTABLE</string>
+	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>VERSION</string>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
 	<key>CFBundleVersion</key>
-	<string>VERSION</string>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2002-2021 wxWidgets</string>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
 	<key>ATSApplicationFontsPath</key>
 	<string>Fonts</string>
 	<key>NSPrincipalClass</key>
diff --git a/src/osx/iphone/Info.plist.in b/src/osx/iphone/Info.plist.in
index c5fbf27117..ee312dc1f8 100644
--- a/src/osx/iphone/Info.plist.in
+++ b/src/osx/iphone/Info.plist.in
@@ -5,11 +5,11 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>EXECUTABLE</string>
+	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>EXECUTABLE version VERSION, (c) 2002-2019 wxWidgets</string>
+	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.wxwindows.IDENTIFIER</string>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLocalizations</key>
@@ -20,9 +20,9 @@
 		<string>it</string>
 	</array>
 	<key>CFBundleLongVersionString</key>
-	<string>VERSION, (c) 2002-2019 wxWidgets</string>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
 	<key>CFBundleName</key>
-	<string>EXECUTABLE</string>
+	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundlePrimaryIcon</key>
@@ -35,11 +35,11 @@
 		<string>AppIcon</string>
 	</dict>
 	<key>CFBundleShortVersionString</key>
-	<string>VERSION</string>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
 	<key>CFBundleVersion</key>
-	<string>VERSION</string>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2002-2019 wxWidgets</string>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 87df2f7797..41e448c2b8 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -493,9 +493,14 @@ test$(EXEEXT): $(TEST_OBJECTS)
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p test_gui.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/EXECUTABLE/test_gui/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.test_gui/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/test_gui/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/test_gui/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/test_gui version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >test_gui.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
@@ -521,9 +526,14 @@ test$(EXEEXT): $(TEST_OBJECTS)
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p test_allheaders.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/EXECUTABLE/test_allheaders/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.test_allheaders/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/test_allheaders/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/test_allheaders/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/test_allheaders version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >test_allheaders.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in
index 13ebde8408..41cd6c5a22 100644
--- a/tests/benchmarks/Makefile.in
+++ b/tests/benchmarks/Makefile.in
@@ -226,9 +226,14 @@ data:
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p bench_gui.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/EXECUTABLE/bench_gui/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.bench_gui/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/bench_gui/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/bench_gui/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/bench_gui version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >bench_gui.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
@@ -251,9 +256,14 @@ data:
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p bench_graphics.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/EXECUTABLE/bench_graphics/" \
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.bench_graphics/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/bench_graphics/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/bench_graphics/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/bench_graphics version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >bench_graphics.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	
diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in
index 0408784fb3..e532a72ddb 100644
--- a/utils/helpview/src/Makefile.in
+++ b/utils/helpview/src/Makefile.in
@@ -172,9 +172,14 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p helpview.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/helpview/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.helpview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/helpview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/helpview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/helpview version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >helpview.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
diff --git a/utils/screenshotgen/src/Makefile.in b/utils/screenshotgen/src/Makefile.in
index a1c3f84d6d..fe8f17fae7 100644
--- a/utils/screenshotgen/src/Makefile.in
+++ b/utils/screenshotgen/src/Makefile.in
@@ -189,9 +189,14 @@ screenshotgen$(EXEEXT): $(SCREENSHOTGEN_OBJECTS) $(__screenshotgen___win32rc)
 @COND_PLATFORM_MACOSX_1@	mkdir -p screenshotgen.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/screenshotgen/" \
-@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.screenshotgen/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/screenshotgen/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/screenshotgen/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_INFO_STRING}/screenshotgen version $(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2021 wxWidgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \
 @COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >screenshotgen.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@