diff --git a/ChangeLog b/ChangeLog
index 19b8df9779404a1aec9d2915bc664ba241fba6c3..6ec1af26002961600ab701f3a8667748f14f6ae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-11-24  Niels M�ller  <nisse@lysator.liu.se>
+
+	From Martin Storsj�:
+	* testsuite/sexp-conv-test: Use $EMULATOR when running test
+	programs. Also ignore \r for output in the non-canonical output
+	formats.
+
+	* testsuite/Makefile.in (check): Pass $(EMULATOR) in the
+	environment of run-tests.
+
+	* configure.ac (EMULATOR): New substituted variable. Set to wine
+	or wine64 when compiling for windows, otherwise empty.
+
+	* config.make.in (EMULATOR): Set from autoconf value.
+
 2011-11-20  Niels M�ller  <nisse@lysator.liu.se>
 
 	* x86/camellia-crypt-internal.asm: Take ALIGNOF_UINT64_T into