diff --git a/tools/packaging/macos/launcher/ROOT/Applications/PowerShell.app/Contents/Info.plist b/tools/packaging/macos/launcher/ROOT/Applications/PowerShell.app/Contents/Info.plist
new file mode 100644
index 0000000000..42a5ce3fa3
--- /dev/null
+++ b/tools/packaging/macos/launcher/ROOT/Applications/PowerShell.app/Contents/Info.plist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>PowerShell.sh</string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string></string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>PowerShell</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/tools/packaging/macos/launcher/ROOT/Applications/PowerShell.app/Contents/MacOS/PowerShell.sh b/tools/packaging/macos/launcher/ROOT/Applications/PowerShell.app/Contents/MacOS/PowerShell.sh
new file mode 100755
index 0000000000..d20a8780b4
--- /dev/null
+++ b/tools/packaging/macos/launcher/ROOT/Applications/PowerShell.app/Contents/MacOS/PowerShell.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+open /usr/local/bin/pwsh
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index bf5f60c210..eedbcfa351 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -679,6 +679,54 @@ function New-UnixPackage {
             "$GzipFile=$ManFile",
             "/tmp/pwsh=$Link"
         )
+
+        # Add macOS powershell launcher
+        if($Type -eq "osxpkg")
+        {
+            if($pscmdlet.ShouldProcess("Add macOS launch application")) {
+                # Define folder for launch application.
+                $macosapp = "$PSScriptRoot/macos/launcher/ROOT/Applications/Powershell.app"
+
+                # Update icns file.
+                $iconfile = "$PSScriptRoot/../../assets/Powershell.icns"
+                $iconfilebase = (Get-Item -Path $iconfile).BaseName
+
+                # Create Resources folder, ignore error if exists.
+                New-Item -Force -ItemType Directory -Path "$macosapp/Contents/Resources" | Out-Null
+                Copy-Item -Force -Path $iconfile -Destination "$macosapp/Contents/Resources"
+
+                # Set values in plist.
+                $plist = "$macosapp/Contents/Info.plist"
+                Start-NativeExecution {
+                    defaults write $plist CFBundleIdentifier com.microsoft.powershell
+                    defaults write $plist CFBundleVersion $Version
+                    defaults write $plist CFBundleShortVersionString $Version
+                    defaults write $plist CFBundleGetInfoString $Version
+                    defaults write $plist CFBundleIconFile $iconfilebase
+                }
+
+                # Convert to XML plist, needed because defaults native
+                # app auto converts it to binary format when it modify
+                # the plist file.
+                Start-NativeExecution {
+                    plutil -convert xml1 $plist
+                }
+
+                # Set permissions for plist and shell script. Note that
+                # defaults native app sets 700 when writing to the plist
+                # file from above. Both of these will be reset post fpm.
+                $shellscript = "$macosapp/Contents/MacOS/PowerShell.sh"
+                Start-NativeExecution {
+                    chmod 644 $plist
+                    chmod 755 $shellscript
+                }
+
+                # Add app folder to fpm paths.
+                $appsfolder = (Resolve-Path -Path "$macosapp/..").Path
+                $Arguments += "$appsfolder=/"
+            }
+        }
+
         # Build package
         try {
             if($pscmdlet.ShouldProcess("Create $type package")) {
@@ -686,6 +734,28 @@ function New-UnixPackage {
             }
         } finally {
             if ($Environment.IsMacOS) {
+                if($pscmdlet.ShouldProcess("Cleanup macOS launcher"))
+                {
+                    # This is needed to prevent installer from picking up
+                    # the launcher app in the build structure and updating
+                    # it which locks out subsequent package builds due to
+                    # increase permissions.
+                    $macosapp = "$PSScriptRoot/macos/launcher/ROOT/Applications/Powershell.app"
+                    $plist = "$macosapp/Contents/Info.plist"
+                    $tempguid = (New-Guid).Guid
+                    Start-NativeExecution {
+                        defaults write $plist CFBundleIdentifier $tempguid
+                        plutil -convert xml1 $plist
+                    }
+
+                    # Restore default permissions.
+                    $shellscript = "$macosapp/Contents/MacOS/PowerShell.sh"
+                    Start-NativeExecution {
+                        chmod 644 $shellscript
+                        chmod 644 $plist
+                    }
+                }
+
                 # this is continuation of a fpm hack for a weird bug
                 if (Test-Path $hack_dest) {
                     Write-Warning "Move $hack_dest to $symlink_dest (fpm utime bug)"