diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index f130a4eda..9ccc0e188 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -628,6 +628,7 @@ Section "GnuPG" SEC_gnupg
File "bin/gpgtar.exe"
File "libexec/dirmngr_ldap.exe"
File "libexec/gpg-preset-passphrase.exe"
+ File "libexec/gpg-check-pattern.exe"
File "libexec/gpg-wks-client.exe"
ClearErrors
@@ -658,6 +659,11 @@ Section "GnuPG" SEC_gnupg
File "share/gnupg/distsigkey.gpg"
File "share/gnupg/sks-keyservers.netCA.pem"
+ SetOutPath "$INSTDIR\share\gnupg\examples"
+ File "share/gnupg/examples/VS-NfD.prf"
+ File "share/gnupg/examples/Automatic.prf"
+ File "share/gnupg/examples/pwpattern.txt"
+
SetOutPath "$INSTDIR\share\locale\ca\LC_MESSAGES"
File share/locale/ca/LC_MESSAGES/gnupg2.mo
SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES"
@@ -1317,8 +1323,14 @@ Section "-un.gnupg"
Delete "$INSTDIR\bin\gpg-card.exe"
Delete "$INSTDIR\bin\dirmngr_ldap.exe"
Delete "$INSTDIR\bin\gpg-preset-passphrase.exe"
+ Delete "$INSTDIR\bin\gpg-check-pattern.exe"
Delete "$INSTDIR\bin\gpg-wks-client.exe"
+ Delete "$INSTDIR\share\gnupg\examples\VS-NfD.prf"
+ Delete "$INSTDIR\share\gnupg\examples\Automatic.prf"
+ Delete "$INSTDIR\share\gnupg\examples\pwpattern.txt"
+ RMDir "$INSTDIR\share\gnupg\examples"
+
Delete "$INSTDIR\share\gnupg\sks-keyservers.netCA.pem"
Delete "$INSTDIR\share\gnupg\dirmngr-conf.skel"
Delete "$INSTDIR\share\gnupg\distsigkey.gpg"
diff --git a/build-aux/speedo/w32/wixlib.wxs b/build-aux/speedo/w32/wixlib.wxs
index 733ae552c..b751c4306 100644
--- a/build-aux/speedo/w32/wixlib.wxs
+++ b/build-aux/speedo/w32/wixlib.wxs
@@ -64,6 +64,9 @@ and then manually edited:
+
+
+
@@ -155,7 +158,13 @@ and then manually edited:
-
+
+
+
+
+
+
+
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 65105139e..1ad86e5b7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,7 +22,8 @@ AM_CPPFLAGS =
include $(top_srcdir)/am/cmacros.am
examples = examples/README examples/scd-event examples/trustlist.txt \
- examples/vsnfd.prf examples/debug.prf examples/qualified.txt \
+ examples/VS-NfD.prf examples/Automatic.prf \
+ examples/debug.prf examples/qualified.txt \
examples/systemd-user/README \
examples/systemd-user/dirmngr.service \
examples/systemd-user/dirmngr.socket \
diff --git a/doc/examples/Automatic.prf b/doc/examples/Automatic.prf
new file mode 100644
index 000000000..41f9bea0c
--- /dev/null
+++ b/doc/examples/Automatic.prf
@@ -0,0 +1,15 @@
+# Automatic.prf - Configure options for a more automatic mode -*- conf -*-
+#
+# The options for each tool are configured in a section ("[TOOL]");
+# see the respective man page for a description of these options and
+# the gpgconf manpage for a description of this file's syntax.
+
+[gpg]
+auto-key-locate local,wkd,dane
+auto-key-retrieve
+trust-model tofu+pgp$\r$\n'
+
+[gpg-agent]
+default-cache-ttl 900
+max-cache-ttl 3600
+min-passphrase-nonalpha 0
diff --git a/doc/examples/vsnfd.prf b/doc/examples/VS-NfD.prf
similarity index 86%
rename from doc/examples/vsnfd.prf
rename to doc/examples/VS-NfD.prf
index 7224e7566..edb9e018e 100644
--- a/doc/examples/vsnfd.prf
+++ b/doc/examples/VS-NfD.prf
@@ -1,4 +1,4 @@
-# vsnfd.prf - Configure options for the VS-NfD mode -*- conf -*-
+# VS-NfD.prf - Configure options for the VS-NfD mode -*- conf -*-
#
# The options for each tool are configured in a section ("[TOOL]");
# see the respective man page for a description of these options and