diff --git a/CHANGELOG b/CHANGELOG
index 9ed65bd..98b3324 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Cleanup of NAND update patch (remove changelog from cmd_nand.c)
+  Patch by Guido Classen, 10 Oct 2006
+
 * Several improvements to the new NAND subsystem:
   - JFFS2 related commands implemented in mtd-utils style
   - Support for bad blocks
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 274ef0b..fdbe7c7 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -341,7 +341,6 @@
 		return ret == 0 ? 0 : 1;
 	}
 
-	/* 2006-09-28 gc: implement missing commands */
 	if (strcmp(cmd, "markbad") == 0) {
 		addr = (ulong)simple_strtoul(argv[2], NULL, 16);
 
diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c
index 8283413..3db224a 100644
--- a/lib_generic/crc32.c
+++ b/lib_generic/crc32.c
@@ -171,9 +171,8 @@
     return crc ^ 0xffffffffL;
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_JFFS2)					\
-	|| (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
-
+#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || (CONFIG_COMMANDS & CFG_CMD_NAND)) \
+	&& !defined(CFG_NAND_LEGACY)
 
 /* No ones complement version. JFFS2 (and other things ?)
  * don't use ones compliment in their CRC calculations.