diff --git a/Makefile.am b/Makefile.am
index e54202748..76c298c4b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -147,6 +147,8 @@ all-local:
 	     do ln -sf ../scd/$$i .; done; \
 	 for i in gpg-preset-passphrase; \
 	     do ln -sf ../agent/$$i .; done; \
+	 for i in tpm2daemon; \
+             do [ -f ../tpm2d/$$i ] && ln -sf ../tpm2d/$$i .; done; \
 	 echo "created links to binaries" )
 
 
diff --git a/tests/gpgconf.ctl.in b/tests/gpgconf.ctl.in
index 9bde62484..fa3e988ac 100644
--- a/tests/gpgconf.ctl.in
+++ b/tests/gpgconf.ctl.in
@@ -9,7 +9,7 @@
 # now is "rootdir" which must be followed by one optional space, an
 # equal sign, and the value for the root directory.  Environment
 # variables are substituted in standard shell manner, the final value
-# must start with a slash, trailing slashed are stripped.
+# must start with a slash, trailing slashes are stripped.
 
 sysconfdir = $GNUPG_BUILD_ROOT/etc
 rootdir = $GNUPG_BUILD_ROOT/