diff --git a/compiler/utils/msg2inc.pp b/compiler/utils/msg2inc.pp
index 0af3a52b16..38a7c7f700 100644
--- a/compiler/utils/msg2inc.pp
+++ b/compiler/utils/msg2inc.pp
@@ -730,6 +730,9 @@ begin
                end;
               if s[i+k]='_' then
                inc(i,k+1);
+              if number<>'' then
+                writeln(t,'\index[msgnr]{',number,'}');
+              writeln(t,'\index[msgtxt]{',escapestring(Copy(s,i,255)),'}');
               writeln(t,'\item ['+s1+escapestring(Copy(s,i,255))+'] \hfill \\');
             end
            else