diff --git a/CHANGES b/CHANGES
index 406ade90..3f0c156d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,11 +19,11 @@ ask CVS about it:
 
 2.6.6 (2002????)
   NOTE: Requires i2c-2.6.6 or newer.
-  File doc/busses/i2c-sis645: add license
-  File doc/chips/lm92: add license, add features
-  File doc/chips/maxilife: add license, add parameters, add features
-  File doc/chips/smartbatt: complete rewrite
-  File doc/chips/vt8231: add license, add parameters
+  File doc/busses/i2c-sis645: Add license
+  File doc/chips/lm92: Add license, features
+  File doc/chips/maxilife: Add license, parameters, features
+  File doc/chips/smartbatt: Complete rewrite
+  File doc/chips/vt8231: Add license, parameters
   Library: Add support for MC1066; add multiple VRM version support for lm87;
            enhance adm1023 support
   Makefile: Take kernel source location from /lib/modules/x.x.x/build
@@ -32,15 +32,18 @@ ask CVS about it:
   Module gl518sm: Iterate allowed only for rev 0x00
   Module i2c-amd756: Configure base address for nForce support;
                      check for uninitialized base address
-  Module i2c-sis630: added support for SiS730
-  Module i2c-sis645: improved support for SiS645/961
-                     added support for SiS645DX/961 and SiS735
+  Module i2c-sis630: Add support for SiS730
+  Module i2c-sis645: Improve support for SiS645/961;
+                     add support for SiS645DX/961 and SiS735
   Module i2c-viapro: VT8233A (new ID 0x3177)
   Module lm87: Add multiple VRM version support
   Module w83781d: Fix in0/in1 initialization
   Module smartbatt: New
   Program dmidecode: Fix read bug
-  Program lm_sensors.init: remove spaces bug, add green/red output
+  Program doc-insmod: Complete rewrite; fix author output
+  Program doc-features: Complete rewrite; handle missing sysctl entries;
+                        handle unknown prefix with suggestion
+  Program lm_sensors.init: Remove spaces bug; add green/red output
   Program mkpatch: Fix dmi_scan module compile
   Program sensors: Add support for MC1066, Rambus Rimms;
                    fix w83781d temp3 alarm; fix gl518sm rev 0x00 recognition
diff --git a/prog/doc/doc-features.pl b/prog/doc/doc-features.pl
index daae2d36..e70afad8 100755
--- a/prog/doc/doc-features.pl
+++ b/prog/doc/doc-features.pl
@@ -324,7 +324,27 @@ if (@ARGV)
 	my %rprefix = reverse %prefix;
 	foreach my $prefix (@ARGV)
 	{
-		output_data($rprefix{$prefix});
+		if (exists $rprefix{$prefix})
+		{
+			output_data($rprefix{$prefix})
+		}
+		else
+		{
+			my $lines = 0;
+			print "No chip named `$prefix' was found.\n",
+				"Suggestions:\n";
+			foreach my $k (sort keys %rprefix)
+			{
+				if (grep /$prefix/, $k)
+				{
+					print "  $k\n";
+					$lines++;
+				}
+			}
+			print "  (none)\n"
+				unless $lines;
+			print "\n";
+		}
 	}
 }
 else
diff --git a/prog/doc/doc-insmod.pl b/prog/doc/doc-insmod.pl
index f62f9fc2..289ab5c4 100755
--- a/prog/doc/doc-insmod.pl
+++ b/prog/doc/doc-insmod.pl
@@ -54,7 +54,7 @@ sub print_modinfo
 	
 	my ($author, $license);
 	$author = `$modinfo -a $modname`;
-	$author =~ s/\n\s*/ /mg;
+	$author =~ s/\n\s+/ /mg; # handle multiline authors
 	$author =~ s/^"//;
 	$author =~ s/"$//;
 	if (defined $version and $version >= (2<<16)+(4<<8)+15)
@@ -69,14 +69,18 @@ sub print_modinfo
 		if defined $license;
 	print "\n", "Module Parameters\n", "-----------------\n", "\n";
 
+	my $lines = 0;
 	open OPTIONS, "$modinfo -p $modname |";
 	while (<OPTIONS>)
 	{
 		next unless m/^(parm:\s*)?(\S+) (.+), description "(.*)"$/;
 		print "* $2: $3\n",
 			wrap('  ', '  ', $4), "\n";
+		$lines++;
 	}
 	close OPTIONS;
+	print "(none)\n"
+		unless $lines;
 }
 
 if (@ARGV != 1 or $ARGV[0] =~ /^-/)