diff --git a/ChangeLog b/ChangeLog
index 8fd9e73edfda9fac528a3016b2e20978f3de7833..e9cea05e87d823e26f87a44126806252687dec1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-08  Niels Möller  <niels@s3.kth.se>
+
+	* examples/rsa-encrypt-test: Avoid reading and executing a file at
+	the same time.
+	* examples/setup-env: Likewise.
+
 2004-10-06  Niels Möller  <niels@s3.kth.se>
 
 	* testsuite/symbols-test: Ignore __i686.get_pc_thunk.bx and
diff --git a/examples/rsa-encrypt-test b/examples/rsa-encrypt-test
index 1c0e6f2fd5aae37f7e4dad7bce9ef97eccb462fe..08b7a44700b4cbc38576eac0141a7e30172d6e65 100755
--- a/examples/rsa-encrypt-test
+++ b/examples/rsa-encrypt-test
@@ -7,7 +7,7 @@ fi
 data="$srcdir/nettle-benchmark.c"
 
 if [ -x rsa-encrypt ] ; then
-  if ./rsa-encrypt -r rsa-encrypt testkey.pub < "$data" > testciphertext ; then
+  if ./rsa-encrypt -r rsa-decrypt testkey.pub < "$data" > testciphertext ; then
     :
   else
     exit 1
diff --git a/examples/setup-env b/examples/setup-env
index 38d7a0c423dec89b29ee8417a1e7aad57b449238..7588d6f88b19986051621334d463d9daf63a1979 100755
--- a/examples/setup-env
+++ b/examples/setup-env
@@ -1,5 +1,7 @@
 #! /bin/sh
 
+set -e
+
 if [ -x rsa-keygen ] ; then
-  ./rsa-keygen -r rsa-keygen -o testkey || exit 1
+  ./rsa-keygen -r rsa-decrypt -o testkey || exit 1
 fi