diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
index 18dbca4a09..cc38f3f577 100755
--- a/packaging/linux/buildpackage.sh
+++ b/packaging/linux/buildpackage.sh
@@ -24,6 +24,9 @@ make install-all prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
 # Icons and .desktop files
 make install-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
 
+# Remove the WinForms dialog which is replaced with a native one provided by zenity
+rm $PWD/packaging/linux/$ROOTDIR/usr/lib/openra/OpenRA.CrashDialog.exe
+
 # Documentation
 mkdir -p $PWD/packaging/linux/$ROOTDIR/usr/share/doc/openra/
 cp *.html $PWD/packaging/linux/$ROOTDIR/usr/share/doc/openra/
diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh
index c076f31894..d5c943a208 100755
--- a/packaging/osx/buildpackage.sh
+++ b/packaging/osx/buildpackage.sh
@@ -16,9 +16,11 @@ fi
 cp -rv template.app OpenRA.app
 cp -rv $2/* $3/* "OpenRA.app/Contents/Resources/" || exit 3
 
-# Icon isn't used, and editor doesn't work.
+# Remove unused icon
 rm OpenRA.app/Contents/Resources/OpenRA.ico
+# Remove broken WinForms applications
 rm OpenRA.app/Contents/Resources/OpenRA.Editor.exe
+rm OpenRA.app/Contents/Resources/OpenRA.CrashDialog.exe
 
 # Package app bundle into a zip and clean up
 zip OpenRA-$1 -r -9 OpenRA.app