8 files changed, 21 insertions, 19 deletions

diff --git a/Config.in b/Config.in
index 5a7eda66a..0da09c1cd 100644
--- a/Config.in
+++ b/Config.in
@@ -434,7 +434,7 @@ config FEATURE_VERSIONINFO
 
 choice
         prompt "Manifest"
-        default FEATURE_TOOLCHAIN_MANIFEST
+        default FEATURE_APP_MANIFEST
         depends on FEATURE_RESOURCES
         help
           Manifest to include in resources.
@@ -443,14 +443,14 @@ config FEATURE_TOOLCHAIN_MANIFEST
         bool "Toolchain default"
         help
         Include the default application manifest provided by the build
-        toolchain, if any.
+        toolchain, if any.  Enable this if your build toolchain includes
+        a suitable manifest.
 
 config FEATURE_APP_MANIFEST
         bool "Application"
         help
         Include a manifest which declares privileges required by the
-        application and supported versions of Windows.  Enable this
-        if your build toolchain doesn't include it by default.
+        application and supported versions of Windows.
 
 config FEATURE_UTF8_MANIFEST
         bool "UTF-8"
diff --git a/README.md b/README.md
index 955aec828..d800eb11b 100644
--- a/README.md
+++ b/README.md
@@ -10,9 +10,9 @@ You need a MinGW compiler and a POSIX environment.  I cross-compile on Linux.  O
 
 `dnf install gcc make ncurses-devel perl-Pod-Html`
 
-`dnf install mingw64-gcc mingw64-windows-default-manifest` (for a 64-bit build)
+`dnf install mingw64-gcc (for a 64-bit build)
 
-`dnf install mingw32-gcc mingw32-windows-default-manifest` (for a 32-bit build)
+`dnf install mingw32-gcc (for a 32-bit build)
 
 On Microsoft Windows you can install [w64devkit](https://github.com/skeeto/w64devkit/releases).  Get the `-i686` variant for a 32-bit build.  Unzip the file and run `w64devkit/w64devkit.exe`.
 
diff --git a/configs/make32_defconfig b/configs/make32_defconfig
index 0892801d3..be793be52 100644
--- a/configs/make32_defconfig
+++ b/configs/make32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Thu Sep 14 16:00:50 2023
+# Fri Sep 15 08:35:20 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -48,8 +48,8 @@ CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
 # CONFIG_FEATURE_RESOURCES is not set
 # CONFIG_FEATURE_VERSIONINFO is not set
-CONFIG_FEATURE_TOOLCHAIN_MANIFEST=y
-# CONFIG_FEATURE_APP_MANIFEST is not set
+# CONFIG_FEATURE_TOOLCHAIN_MANIFEST is not set
+CONFIG_FEATURE_APP_MANIFEST=y
 # CONFIG_FEATURE_UTF8_MANIFEST is not set
 # CONFIG_FEATURE_ICON is not set
 # CONFIG_FEATURE_ICON_ATERM is not set
diff --git a/configs/make64_defconfig b/configs/make64_defconfig
index 8c372ae54..71f08c502 100644
--- a/configs/make64_defconfig
+++ b/configs/make64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Thu Sep 14 16:00:50 2023
+# Fri Sep 15 08:35:20 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -48,8 +48,8 @@ CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
 # CONFIG_FEATURE_RESOURCES is not set
 # CONFIG_FEATURE_VERSIONINFO is not set
-CONFIG_FEATURE_TOOLCHAIN_MANIFEST=y
-# CONFIG_FEATURE_APP_MANIFEST is not set
+# CONFIG_FEATURE_TOOLCHAIN_MANIFEST is not set
+CONFIG_FEATURE_APP_MANIFEST=y
 # CONFIG_FEATURE_UTF8_MANIFEST is not set
 # CONFIG_FEATURE_ICON is not set
 # CONFIG_FEATURE_ICON_ATERM is not set
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index 9a822e351..12e432500 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Thu Sep 14 16:00:50 2023
+# Fri Sep 15 08:35:20 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -48,8 +48,8 @@ CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
 CONFIG_FEATURE_RESOURCES=y
 CONFIG_FEATURE_VERSIONINFO=y
-CONFIG_FEATURE_TOOLCHAIN_MANIFEST=y
-# CONFIG_FEATURE_APP_MANIFEST is not set
+# CONFIG_FEATURE_TOOLCHAIN_MANIFEST is not set
+CONFIG_FEATURE_APP_MANIFEST=y
 # CONFIG_FEATURE_UTF8_MANIFEST is not set
 CONFIG_FEATURE_ICON=y
 # CONFIG_FEATURE_ICON_ATERM is not set
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 7a83a096f..dd5a9b068 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Thu Sep 14 16:00:50 2023
+# Fri Sep 15 08:35:20 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -48,8 +48,8 @@ CONFIG_FEATURE_PRNG_SHELL=y
 # CONFIG_FEATURE_PRNG_ISAAC is not set
 CONFIG_FEATURE_RESOURCES=y
 CONFIG_FEATURE_VERSIONINFO=y
-CONFIG_FEATURE_TOOLCHAIN_MANIFEST=y
-# CONFIG_FEATURE_APP_MANIFEST is not set
+# CONFIG_FEATURE_TOOLCHAIN_MANIFEST is not set
+CONFIG_FEATURE_APP_MANIFEST=y
 # CONFIG_FEATURE_UTF8_MANIFEST is not set
 CONFIG_FEATURE_ICON=y
 # CONFIG_FEATURE_ICON_ATERM is not set
diff --git a/configs/mingw64u_defconfig b/configs/mingw64u_defconfig
index e9425d45b..159f409d9 100644
--- a/configs/mingw64u_defconfig
+++ b/configs/mingw64u_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.37.0.git
-# Thu Sep 14 16:00:50 2023
+# Fri Sep 15 08:35:20 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
diff --git a/scripts/mk_mingw64u_defconfig b/scripts/mk_mingw64u_defconfig
index 760c55a00..19124d735 100755
--- a/scripts/mk_mingw64u_defconfig
+++ b/scripts/mk_mingw64u_defconfig
@@ -34,3 +34,5 @@ set_build_opts \
     CONFIG_UNICODE_WIDE_WCHARS=y \
     < "$configs"/mingw64_defconfig \
     > "$configs"/mingw64u_defconfig
+
+sed -i 's/CONFIG_FEATURE_APP_MANIFEST=y/# CONFIG_FEATURE_APP_MANIFEST is not set/' "$configs"/mingw64u_defconfig