diff --git a/CMakeLists.txt b/CMakeLists.txt
index d937d724d9..c8ea2ea39b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1409,14 +1409,19 @@ else()
 endif()
 
 if(ENABLE_APPLICATION_BUNDLE)
-	# codesign barfs if we put our plugins in a dotted version subdirectory,
-	# e.g. PlugIns/Wireshark/3.1/epan so leave the version component out
-	# for now.
+	#
+	# XXX - codesign barfs if we put our plugins in a dotted version
+	# subdirectory, e.g. PlugIns/Wireshark/3.1/epan, so we either
+	# need to figure out how to make it work, or need to leave the
+	# version component out *AND*, on macOS, look for compiled
+	# plugins in the plugins directory rather than in the dotted
+	# version subdirectory.
+	#
 	if(CMAKE_CFG_INTDIR STREQUAL ".")
-		set(_plugin_dir "${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark")
+		set(_plugin_dir "${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark/${PROJECT_RELEASE_VERSION}")
 	else()
-	  # Xcode
-		set(_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/Wireshark.app/Contents/PlugIns/wireshark")
+		# Xcode
+		set(_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/Wireshark.app/Contents/PlugIns/wireshark/${PROJECT_RELEASE_VERSION}")
 	endif()
 elseif(WIN32 AND NOT CMAKE_CFG_INTDIR STREQUAL ".")
 	set(_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/${PLUGIN_VERSION_DIR}")
diff --git a/packaging/macosx/osx-app.sh.in b/packaging/macosx/osx-app.sh.in
index 4ed87e1dd8..d4d5024ad1 100755
--- a/packaging/macosx/osx-app.sh.in
+++ b/packaging/macosx/osx-app.sh.in
@@ -123,7 +123,7 @@ exclude_prefixes="$exclude_prefixes|$qt_frameworks_dir"
 pkgexec="$bundle/Contents/MacOS"
 #pkgres="$bundle/Contents/Resources"
 pkglib="$bundle/Contents/Frameworks"
-pkgplugin="$bundle/Contents/PlugIns/wireshark"
+pkgplugin="$bundle/Contents/PlugIns/wireshark/@VERSION_MAJOR@.@VERSION_MINOR@"
 
 # Set the 'macosx' directory, usually the current directory.
 #resdir=$( pwd )