diff --git a/compiler/scandir.inc b/compiler/scandir.inc
index 2b007d49ed..3f88434966 100644
--- a/compiler/scandir.inc
+++ b/compiler/scandir.inc
@@ -765,7 +765,16 @@ const
         s : string;
       begin
         current_scanner^.skipspace;
-        s:=AddExtension(FixFileName(current_scanner^.readcomment),target_info.resext);
+        s:=current_scanner^.readcomment;
+        { replace * with current module name.
+          This should always be defined. }
+        if s[1]='*' then
+          if Assigned(Current_Module) then
+            begin
+            delete(S,1,1);
+            insert(lower(current_module^.modulename^),S,1);
+            end;
+        s:=AddExtension(FixFileName(s),target_info.resext);
         if target_info.res<>res_none then
           current_module^.resourcefiles.insert(FixFileName(s))
         else
@@ -1299,7 +1308,10 @@ const
 
 {
   $Log$
-  Revision 1.76  2000-02-28 17:23:57  daniel
+  Revision 1.77  2000-04-08 20:18:53  michael
+  * Fixed bug in readcomment that was dropping * characters
+
+  Revision 1.76  2000/02/28 17:23:57  daniel
   * Current work of symtable integration committed. The symtable can be
     activated by defining 'newst', but doesn't compile yet. Changes in type
     checking and oop are completed. What is left is to write a new
@@ -1378,4 +1390,4 @@ const
     * C alignment added for records
     * PPU version increased to solve .12 <-> .13 probs
 
-}
+}
\ No newline at end of file
diff --git a/compiler/scanner.pas b/compiler/scanner.pas
index d2bbe53d98..9cc9b7f8d0 100644
--- a/compiler/scanner.pas
+++ b/compiler/scanner.pas
@@ -829,7 +829,28 @@ implementation
                    readchar;
                    dec_comment_level;
                    break;
-                 end;
+                 end
+                else
+                 { Add both characters !!}
+                 if (i<255) then
+                   begin
+                   inc(i);
+                   readcomment[i]:='*';
+                   if (i<255) then
+                     begin
+                     inc(i);
+                     readcomment[i]:='*';
+                     end;
+                   end;
+              end
+             else
+              { Not old TP comment, so add...}
+              begin
+              if (i<255) then
+               begin
+               inc(i);
+               readcomment[i]:='*';
+               end;
               end;
            #26 :
               end_of_file;
@@ -1790,7 +1811,10 @@ exit_label:
 end.
 {
   $Log$
-  Revision 1.109  2000-03-13 21:21:57  peter
+  Revision 1.110  2000-04-08 20:18:53  michael
+  * Fixed bug in readcomment that was dropping * characters
+
+  Revision 1.109  2000/03/13 21:21:57  peter
     * ^m support also after a string
 
   Revision 1.108  2000/03/12 17:53:16  florian
@@ -1875,4 +1899,4 @@ end.
     * directives are allowed in (* *)
     * fixed parsing of (* between conditional code
 
-}
+}
\ No newline at end of file