diff --git a/CHANGELOG b/CHANGELOG
index 68aa65a..166cfa3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Fix spelling; minor code cleanup.
+
 * Fix JFFS2 compilation problem
   Patch by Stefan Roese, 12 Oct 2006
 
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index fdbe7c7..7042a9c 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -251,7 +251,7 @@
 			       "Use this command only for testing purposes "
 			       "if you\n"
 			       "	 "
-			       "are shure of what you are doing!\n"
+			       "are sure of what you are doing!\n"
 			       "\nReally scrub this NAND flash? <y/N>\n"
 				);
 
diff --git a/drivers/nand/nand_util.c b/drivers/nand/nand_util.c
index 5a8e58a..7570210 100644
--- a/drivers/nand/nand_util.c
+++ b/drivers/nand/nand_util.c
@@ -170,9 +170,9 @@
 			if (ret > 0) {
 				if (!opts->quiet)
 					printf("\rSkipping bad block at  "
-                                               "0x%08x                   "
-                                               "                         \n",
-                                               erase.addr);
+					       "0x%08x                   "
+					       "                         \n",
+					       erase.addr);
 				continue;
 
 			} else if (ret < 0) {