diff --git a/compiler/z80/agsdasz80.pas b/compiler/z80/agsdasz80.pas
index aa3036ffbf..c37a71b7cd 100644
--- a/compiler/z80/agsdasz80.pas
+++ b/compiler/z80/agsdasz80.pas
@@ -349,9 +349,9 @@ unit agsdasz80;
                       ;
                   end;
                   if o.ref^.offset<>0 then
-                    writer.AsmWrite('('+o.ref^.symbol.name+'+'+tostr(o.ref^.offset)+')')
+                    writer.AsmWrite('('+ReplaceForbiddenAsmSymbolChars(o.ref^.symbol.name)+'+'+tostr(o.ref^.offset)+')')
                   else
-                    writer.AsmWrite(o.ref^.symbol.name);
+                    writer.AsmWrite(ReplaceForbiddenAsmSymbolChars(o.ref^.symbol.name));
                 end
               else if not assigned(o.ref^.symbol) and
                  ((o.ref^.base<>NR_NO) or (o.ref^.index<>NR_NO)) and
@@ -397,7 +397,7 @@ unit agsdasz80;
                         AddSymbol(o.ref^.symbol.name,false);}
                       if need_plus then
                         writer.AsmWrite('+');
-                      writer.AsmWrite(o.ref^.symbol.name);
+                      writer.AsmWrite(ReplaceForbiddenAsmSymbolChars(o.ref^.symbol.name));
                       need_plus:=true;
                     end;
                   if o.ref^.offset<>0 then
@@ -435,7 +435,7 @@ unit agsdasz80;
                 end
               else
                 begin
-                  writer.AsmWrite(o.ref^.symbol.name);
+                  writer.AsmWrite(ReplaceForbiddenAsmSymbolChars(o.ref^.symbol.name));
                   //if SmartAsm then
                   //  AddSymbol(o.ref^.symbol.name,false);
                   if o.ref^.offset>0 then
@@ -460,7 +460,7 @@ unit agsdasz80;
           begin
             sym:=TAsmSymbol(current_asmdata.AsmSymbolDict[i]);
             if sym.bind in [AB_EXTERNAL,AB_EXTERNAL_INDIRECT] then
-              writer.AsmWriteln(#9'.globl'#9+sym.name);
+              writer.AsmWriteln(#9'.globl'#9+ReplaceForbiddenAsmSymbolChars(sym.name));
           end;
         writer.AsmWriteln('; End externals');
       end;
@@ -632,7 +632,7 @@ unit agsdasz80;
               begin
                 if tai_label(hp).labsym.is_used then
                   begin
-                    writer.AsmWrite(tai_label(hp).labsym.name);
+                    writer.AsmWrite(ReplaceForbiddenAsmSymbolChars(tai_label(hp).labsym.name));
                     if tai_label(hp).labsym.bind in [AB_GLOBAL,AB_PRIVATE_EXTERN] then
                       writer.AsmWriteLn('::')
                     else
@@ -644,16 +644,16 @@ unit agsdasz80;
                 if not(tai_symbol(hp).has_value) then
                   begin
                     if tai_symbol(hp).is_global then
-                      writer.AsmWriteLn(tai_symbol(hp).sym.name + '::')
+                      writer.AsmWriteLn(ReplaceForbiddenAsmSymbolChars(tai_symbol(hp).sym.name) + '::')
                     else
-                      writer.AsmWriteLn(tai_symbol(hp).sym.name + ':');
+                      writer.AsmWriteLn(ReplaceForbiddenAsmSymbolChars(tai_symbol(hp).sym.name) + ':');
                   end
                 else
                   begin
                     if tai_symbol(hp).is_global then
-                      writer.AsmWriteLn(tai_symbol(hp).sym.name + '==' + tostr(tai_symbol(hp).value))
+                      writer.AsmWriteLn(ReplaceForbiddenAsmSymbolChars(tai_symbol(hp).sym.name) + '==' + tostr(tai_symbol(hp).value))
                     else
-                      writer.AsmWriteLn(tai_symbol(hp).sym.name + '=' + tostr(tai_symbol(hp).value));
+                      writer.AsmWriteLn(ReplaceForbiddenAsmSymbolChars(tai_symbol(hp).sym.name) + '=' + tostr(tai_symbol(hp).value));
                   end;
               end;
             ait_symbol_end :
@@ -662,9 +662,9 @@ unit agsdasz80;
             ait_datablock :
               begin
                 if tai_datablock(hp).is_global or SmartAsm then
-                  writer.AsmWrite(tai_datablock(hp).sym.name + '::')
+                  writer.AsmWrite(ReplaceForbiddenAsmSymbolChars(tai_datablock(hp).sym.name) + '::')
                 else
-                  writer.AsmWrite(tai_datablock(hp).sym.name + ':');
+                  writer.AsmWrite(ReplaceForbiddenAsmSymbolChars(tai_datablock(hp).sym.name) + ':');
                 {if SmartAsm then
                   AddSymbol(tai_datablock(hp).sym.name,true);}
                 writer.AsmWriteLn(#9'.rs'#9+tostr(tai_datablock(hp).size));
@@ -689,9 +689,9 @@ unit agsdasz80;
                         if assigned(tai_const(hp).sym) then
                           begin
                             if assigned(tai_const(hp).endsym) then
-                              s:=tai_const(hp).endsym.name+'-'+tai_const(hp).sym.name
+                              s:=ReplaceForbiddenAsmSymbolChars(tai_const(hp).endsym.name)+'-'+ReplaceForbiddenAsmSymbolChars(tai_const(hp).sym.name)
                             else
-                              s:=tai_const(hp).sym.name;
+                              s:=ReplaceForbiddenAsmSymbolChars(tai_const(hp).sym.name);
                             if tai_const(hp).value<>0 then
                               s:=s+tostr_with_plus(tai_const(hp).value);
                             if consttype in [aitconst_64bit,aitconst_64bit_unaligned] then
@@ -736,9 +736,9 @@ unit agsdasz80;
                         if assigned(tai_const(hp).sym) then
                           begin
                             if assigned(tai_const(hp).endsym) then
-                              s:=tai_const(hp).endsym.name+'-'+tai_const(hp).sym.name
+                              s:=ReplaceForbiddenAsmSymbolChars(tai_const(hp).endsym.name)+'-'+ReplaceForbiddenAsmSymbolChars(tai_const(hp).sym.name)
                             else
-                              s:=tai_const(hp).sym.name;
+                              s:=ReplaceForbiddenAsmSymbolChars(tai_const(hp).sym.name);
                             if tai_const(hp).value<>0 then
                               s:=s+tostr_with_plus(tai_const(hp).value);
                           end