diff --git a/ChangeLog b/ChangeLog
index 42bb96ccd85822be51e5dd47eb51677eaa618921..2ceea540f7e603ddb8dcf1ba67621f6269ad466c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,18 @@
 2011-11-24  Niels M�ller  <nisse@lysator.liu.se>
 
 	From Martin Storsj�:
+	* examples/Makefile.in (check): Pass $(EMULATOR) and $(EXEEXT) in
+	the environment of run-tests.
+	* examples/rsa-encrypt-test: Use $EXEEXT and $EMULATOR.
+	* examples/rsa-sign-test: Likewise.
+	* examples/rsa-verify-test: Likewise.
+	* examples/setup-env: Likewise.
+
+	* testsuite/Makefile.in (check): Pass $(EXEEXT) in the environment of
+	run-tests.
+	* testsuite/pkcs1-conv-test: Use $EXEEXT and $EMULATOR. Ignore \r
+	in rsa-sign output.
+
 	* examples/rsa-decrypt.c (main) [WIN32]: Set stdout/stdin to
 	binary mode.
 	* examples/rsa-encrypt.c (main): Likewise.