diff --git a/ChangeLog b/ChangeLog
index ac23015c11..f0e07a4c2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-02  Johan Dahlin  <johan@gnome.org>
+
+	* tests/Makefile.am (noinst_PROGRAMS): Remove autotestkeywords, it's added later,
+	fixes non-C++ build.
+	(#496032, Nelson Benitez)
+
 2008-02-29  Johan Dahlin  <johan@gnome.org>
 
 	* demos/gtk-demo/demo.ui:
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 38205b24d9..a985187b3c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -54,7 +54,6 @@ textbuffertest_LDADD 		 = $(LDADDS)
 textbuffertest_SOURCES           = textbuffertest.c pixbuf-init.c
 
 noinst_PROGRAMS =  $(TEST_PROGS)	\
-	autotestkeywords		\
 	simple				\
 	print-editor			\
 	testaccel			\