diff --git a/util/superiotool/README b/util/superiotool/README
index 68fad30b71..cd43941531 100644
--- a/util/superiotool/README
+++ b/util/superiotool/README
@@ -87,10 +87,13 @@ Contributors
 
 Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
 David Hendricks <david.hendricks@gmail.com>
+Frieder Ferlemann <Frieder.Ferlemann@web.de>
+Idwer Vollering <idwer_v@hotmail.com>
 Rasmus Wiman <rasmus@wiman.org>
 Robinson P. Tryon <bishop.robinson@gmail.com>
 Ronald Minnich <rminnich@gmail.com>
 Stefan Reinauer <stepan@coresystems.de>
+Ulf Jordan <jordan@chalmers.se>
 Uwe Hermann <uwe@hermann-uwe.de>
 Ward Vandewege <ward@gnu.org>
 
diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c
index 69d20a1f97..c2fb2fa585 100644
--- a/util/superiotool/smsc.c
+++ b/util/superiotool/smsc.c
@@ -326,7 +326,7 @@ static const struct superio_registers reg_table[] = {
 		{EOT}}},
 	{0x6e, "LPC47B387", {	/* TODO: Not yet in sensors-detect */
 		/* Found in the HP Compaq Business Desktop d530 Series */
-		/* http://thread.gmane.org/gmane.linux.bios/26648 */
+		/* http://article.gmane.org/gmane.linux.bios/27192 */
 		/* We cannot find a public datasheet for this Super I/O. */
 		{EOT}}},
 	{0x6f, "LPC47B397", {
diff --git a/util/superiotool/superiotool.8 b/util/superiotool/superiotool.8
index 64828e8105..9928bf3aed 100644
--- a/util/superiotool/superiotool.8
+++ b/util/superiotool/superiotool.8
@@ -24,8 +24,8 @@ The list of supported Super I/O chips is available at:
 If no command line option is specified,
 .B superiotool
 merely tries to detect the Super I/O chip.
-You must use either the
-.BR "\-d" " or the " "\-D"
+You must use the
+.B "\-d"
 option to dump the Super I/O register contents.
 .TP
 .B "\-d, \-\-dump"
diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
index 72e6b6c923..bce0b324f3 100644
--- a/util/superiotool/superiotool.c
+++ b/util/superiotool/superiotool.c
@@ -115,7 +115,7 @@ static void dump_regs(const struct superio_registers reg_table[],
 			printf(" NA");
 		else if (idx[k] == RSVD)
 			printf(" RR");
-		else if (idx[k] == MISC)	/* TODO */
+		else if (idx[k] == MISC)
 			printf(" MM");
 		else
 			printf(" %02x", idx[k]);
diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index f473e2dd7a..dca64fe0a6 100644
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -2,7 +2,6 @@
  * This file is part of the superiotool project.
  *
  * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2007 Rasmus Wiman <rasmus@wiman.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -389,7 +388,7 @@ static void enter_conf_mode_winbond_86(uint16_t port)
 	outb(0x86, port);
 }
 
-void probe_idregs_winbond_helper(const char *init, uint16_t port)
+static void probe_idregs_winbond_helper(const char *init, uint16_t port)
 {
 	uint16_t id;
 	uint8_t devid, rev, olddevid;
@@ -425,14 +424,11 @@ void probe_idregs_winbond_helper(const char *init, uint16_t port)
 		       get_superio_name(reg_table, id), devid, rev, port);
 	chip_found = 1;
 
-	/* TODO: Special notes in dump output for the MISC entries. */
 	dump_superio("Winbond", reg_table, port, id);
 }
 
 void probe_idregs_winbond(uint16_t port)
 {
-	/* TODO: Not all init sequences are valid for all ports. */
-
 	enter_conf_mode_winbond_88(port);
 	probe_idregs_winbond_helper("(init=0x88) ", port);
 	exit_conf_mode_winbond_fintek_ite_8787(port);