diff --git a/configure.ac b/configure.ac
index 09bd6e414..4b8279780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,7 +280,10 @@ AS_IF([test "x$ENABLED_SSHD" = "xyes"],[
 ])
 
 AC_CONFIG_LINKS([keys/gretel-key-rsa.pub:keys/gretel-key-rsa.pub
-                 keys/gretel-key-rsa.pem:keys/gretel-key-rsa.pem])
+                 keys/gretel-key-rsa.pem:keys/gretel-key-rsa.pem
+                 keys/server-key-rsa.der:keys/server-key-rsa.der
+                 keys/server-key-ecc.der:keys/server-key-ecc.der
+                 keys/server-key-ecc-521.der:keys/server-key-ecc-521.der])
 
 # Set the automake conditionals.
 AM_CONDITIONAL([BUILD_EXAMPLE_SERVERS],[test "x$ENABLED_EXAMPLES" = "xyes"])
diff --git a/scripts/fwd.test b/scripts/fwd.test
index 6214d7db6..1b1c9eb85 100755
--- a/scripts/fwd.test
+++ b/scripts/fwd.test
@@ -8,7 +8,12 @@ then
   exit 77
 fi
 
-if [ ! -x ./scripts/fwd.test.expect ]
+# Automake sets $srcdir for tests. When building out-of-tree (e.g.
+# make distcheck), the expect script only lives in the source tree,
+# not the build tree. Fall back to the current directory otherwise.
+expect_script="${srcdir:-.}/scripts/fwd.test.expect"
+
+if [ ! -x "$expect_script" ]
 then
   echo "fail: missing expect script"
   exit 1
@@ -46,4 +51,4 @@ fi
 
 # Run the expect script
 
-./scripts/fwd.test.expect
+"$expect_script"