diff --git a/ChangeLog b/ChangeLog
index 3fd0d5076d5c200f374792ec861ad801aa0a6c26..945699eaca2d08f59287fd4b2bcd466c3ee0c5ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,18 @@
 2011-11-24  Niels M�ller  <nisse@lysator.liu.se>
 
 	From Martin Storsj�:
+	* testsuite/symbols-test: Use $NM, falling back to nm if undefined.
+	* testsuite/Makefile.in (check): Pass $(NM) in the environment of
+	run-tests.
+	* config.make.in (NM): Set NM.
+
 	* 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 cross compiling for windows, otherwise empty.
-
 	* config.make.in (EMULATOR): Set from autoconf value.
 
 2011-11-20  Niels M�ller  <nisse@lysator.liu.se>
diff --git a/config.make.in b/config.make.in
index 2f26556c1bc767c50cdf16c9b89de95aad458a53..73aecc96c2b28e0661189cb37c244900dae755e4 100644
--- a/config.make.in
+++ b/config.make.in
@@ -12,6 +12,7 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 LIBOBJS = @LIBOBJS@
 EMULATOR = @EMULATOR@
+NM = @NM@
 
 OBJEXT = @OBJEXT@
 EXEEXT = @EXEEXT@