diff --git a/CHANGELOG b/CHANGELOG
index 41fd312f8b0162f5a34f8faf287b90856fd68aca..4f6da77a6947b00d98b3300e0e21a416d4b0e8c6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Check argument count in "mii" command.
+  Problem pointed out by Andrew Dyer, 13 Jun 2005
+
 * Cleanup TQM5200 board configurations:
   - make highboot configurations use environment at high end, too,
     to avoid flash fragmentation
diff --git a/common/cmd_mii.c b/common/cmd_mii.c
index 48a4e77c55a0bfd3de841f866d3bfd15d53ff0b6..ee5e43ee8c759ded1ee299054e745374008c97af 100644
--- a/common/cmd_mii.c
+++ b/common/cmd_mii.c
@@ -57,6 +57,11 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 	int		rcode = 0;
 	char		*devname;
 
+	if (argc < 2) {
+		printf ("Usage:\n%s\n", cmdtp->usage);
+		return 1;
+	}
+
 #if defined(CONFIG_8xx) || defined(CONFIG_MCF52x2)
 	mii_init ();
 #endif