diff --git a/ChangeLog b/ChangeLog
index 7dbbcdcd27a53bc69c56317e764affebf53e39f0..ebcda051e6c18681233ef09face2966cee5dd0f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2004-02-17  Niels Möller  <niels@s3.kth.se>
+
+	* Makefile.am: Protected %-rules used for building pure objects,
+	and for assembler files, by automake conditionals. Needed for
+	makes such as tru64's, which tries to understand %-patterns, but
+	doesn't get it right.
+	(SUFFIXES): Added .html.
+	(.texinfo.html): Rewrote rule to use a traditional suffix target.
+	
+	* configure.ac (enable_assembler): Explicitly set
+	enable_assembler=no, on architectures where we have no assembler
+	files. 
+	(ENABLE_ASSEMBLER, ENABLE_SHARED): New automake conditionals.
+
+	* testsuite/testutils.c (xalloc): xalloc(0) should work also on
+	systems where malloc(0) returns NULL.
+
 2004-02-16  Niels Möller  <niels@s3.kth.se>
 
 	* Makefile.am (%.o: %.asm): Added comment about OSF1 make problem.