diff --git a/doc/tools/code2doc b/doc/tools/code2doc
index ff22bb7fc..e572441d9 100755
--- a/doc/tools/code2doc
+++ b/doc/tools/code2doc
@@ -17,7 +17,7 @@ while (<FILEIN>)
 {
 	if ($found)
 	{
-		if ($_ =~ /^\s+\*\s$/) { next if $first; $_ =~ s/\*// if not $first; }
+		if ($_ =~ /^\s+\*\s$/) { next if $first; $_ =~ s/\s\*// if not $first; }
 		if ($_ =~ /^\s\*+\/$/ or $_ !~ /^\s/) { $found = undef; next; }
 		$_ =~ s/^(\s*)\s\*\s/$1/;
 		$found = 'sorta' if $_ =~ s/\s*\*\/$//;
@@ -32,9 +32,9 @@ while (<FILEIN>)
 		$_ = "$_\n$dash\n";
 		$first = 1;
 	}
-	elsif ($_ =~ /\s*([A-Z0-9_]+),\s*\/\*::\s*(.*)\s*\*\/$/)
+	elsif ($_ =~ /\s*([A-Z0-9_]+),\s*\/\*::\s*(.*)\s+\*\/$/)
 	{
-		$_ =~ s/\s*([A-Z0-9_]+),\s*\/\*::\s*(.*)\s*\*\/$/id[$1]::\n  $2/;
+		$_ =~ s/\s*([A-Z0-9_]+),\s*\/\*::\s*(.*)\s+\*\/$/id[$1]::\n  $2/;
 		$found = 'sorta';
 	}
 	next if not $found;  $found = undef if $found eq 'sorta';