diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index e5294cc7..9b445948 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -3,6 +3,10 @@
   * src/tap/cable.c (urj_tap_cable_wait): Tweak code style to silence warnings
     thrown up by gcc-4.6 and cause build failures with -Werror.
 
+  * src/cmd/Makefile.am (generated_cmd_list.h): Always update the file to
+    avoid constant generation loops where other files are newer, but not
+    a different list of commands.
+
 2011-06-27  Jie Zhang  <jie.zhang@analog.com>
 
   * include/urjtag/Makefile.am (nodist_pkginclude_HEADERS): New and
diff --git a/urjtag/src/cmd/Makefile.am b/urjtag/src/cmd/Makefile.am
index b1a8cb5c..f6432ebc 100644
--- a/urjtag/src/cmd/Makefile.am
+++ b/urjtag/src/cmd/Makefile.am
@@ -85,8 +85,7 @@ generated_cmd_list.h: $(all_cmd_files)
 	cmds=`$(SED) -n '/^const urj_cmd_t urj_cmd_/{s:.*urj_cmd_::;s: =.*::;p}' $^`; \
 	for c in $$cmds ; do \
 		printf '#ifndef URJ_CMD_SKIP_%s\n_URJ_CMD(%s)\n#endif\n' $$c $$c; \
-	done > $@.tmp; \
-	cmp -s $@ $@.tmp && rm -f $@.tmp || mv $@.tmp $@
+	done > $@
 
 EXTRA_DIST = generated_cmd_list.h
 MAINTAINERCLEANFILES = generated_cmd_list.h