diff --git a/compiler/fmodule.pas b/compiler/fmodule.pas
index f3c13ea661..d5a72a6fab 100644
--- a/compiler/fmodule.pas
+++ b/compiler/fmodule.pas
@@ -27,6 +27,9 @@ unit fmodule;
 {$ifdef go32v2}
   {$define shortasmprefix}
 {$endif}
+{$ifdef watcom}
+  {$define shortasmprefix}
+{$endif}
 {$ifdef tos}
   {$define shortasmprefix}
 {$endif}
@@ -708,7 +711,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.49  2004-11-04 23:59:13  peter
+  Revision 1.50  2004-12-28 20:43:01  hajny
+    * 8.3 fixes (short target name in paths)
+
+  Revision 1.49  2004/11/04 23:59:13  peter
   use filepos of main when generating the module stabs
 
   Revision 1.48  2004/10/14 18:16:17  mazen
diff --git a/compiler/globals.pas b/compiler/globals.pas
index b3463c49fb..aaa8fd3dc5 100644
--- a/compiler/globals.pas
+++ b/compiler/globals.pas
@@ -476,7 +476,10 @@ implementation
          Replace(s,'$FPCDATE',date_string);
          Replace(s,'$FPCCPU',target_cpu_string);
          Replace(s,'$FPCOS',target_os_string);
-         Replace(s,'$FPCTARGET',target_full_string);
+         if tf_use_8_3 in Source_Info.Flags then
+           Replace(s,'$FPCTARGET',target_os_string)
+         else
+           Replace(s,'$FPCTARGET',target_full_string);
        end;
 
 
@@ -2145,7 +2148,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.154  2004-12-15 16:06:47  marco
+  Revision 1.155  2004-12-28 20:43:01  hajny
+    * 8.3 fixes (short target name in paths)
+
+  Revision 1.154  2004/12/15 16:06:47  marco
    * introduction "cleanpath" (=fexpand), fixfilename(paramstr(0)) + search $PREFIX/etc/fpc.cfg
 
   Revision 1.153  2004/11/05 13:14:30  florian
diff --git a/compiler/options.pas b/compiler/options.pas
index 6317155841..e0e8885722 100644
--- a/compiler/options.pas
+++ b/compiler/options.pas
@@ -2026,9 +2026,15 @@ begin
   if not disable_configfile then
     begin
       if PathExists(FpcDir+'rtl') then
-        UnitSearchPath.AddPath(FpcDir+'rtl/'+target_full_string,false)
+        if tf_use_8_3 in Source_Info.Flags then
+          UnitSearchPath.AddPath(FpcDir+'rtl/'+target_os_string,false)
+        else
+          UnitSearchPath.AddPath(FpcDir+'rtl/'+target_full_string,false)
       else
-        UnitSearchPath.AddPath(FpcDir+'units/'+target_full_string+'/rtl',false);
+        if tf_use_8_3 in Source_Info.Flags then
+          UnitSearchPath.AddPath(FpcDir+'units/'+target_os_string+'/rtl',false)
+        else
+          UnitSearchPath.AddPath(FpcDir+'units/'+target_full_string+'/rtl',false);
     end;
   { Add exepath if the exe is not in the current dir, because that is always searched already.
     Do not add it when linking on the target because then we can maybe already find
@@ -2095,7 +2101,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.156  2004-12-16 08:06:42  marco
+  Revision 1.157  2004-12-28 20:43:01  hajny
+    * 8.3 fixes (short target name in paths)
+
+  Revision 1.156  2004/12/16 08:06:42  marco
    * slash typo
 
   Revision 1.155  2004/12/15 16:06:47  marco
diff --git a/compiler/systems.pas b/compiler/systems.pas
index bea83708e6..2e0f5904ca 100644
--- a/compiler/systems.pas
+++ b/compiler/systems.pas
@@ -228,7 +228,8 @@ interface
             tf_code_small,tf_static_reg_based,
             tf_needs_symbol_size,
             tf_smartlink_sections,
-            tf_needs_dwarf_cfi
+            tf_needs_dwarf_cfi,
+            tf_use_8_3
        );
 
        psysteminfo = ^tsysteminfo;
@@ -715,7 +716,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.98  2004-12-12 00:35:19  florian
+  Revision 1.99  2004-12-28 20:43:00  hajny
+    * 8.3 fixes (short target name in paths)
+
+  Revision 1.98  2004/12/12 00:35:19  florian
     * check if the selected assembler supports current target improved
 
   Revision 1.97  2004/12/12 00:31:52  florian
diff --git a/compiler/systems/i_atari.pas b/compiler/systems/i_atari.pas
index 017181a763..eefdb67184 100644
--- a/compiler/systems/i_atari.pas
+++ b/compiler/systems/i_atari.pas
@@ -33,7 +33,7 @@ unit i_atari;
             system       : target_m68k_Atari;
             name         : 'Atari ST/STE';
             shortname    : 'atari';
-            flags        : [];
+            flags        : [tf_use_8_3];
             cpu          : cpu_m68k;
             short_name   : 'ATARI';
             unit_env     : '';
@@ -84,7 +84,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.4  2004-10-25 15:38:41  peter
+  Revision 1.5  2004-12-28 20:43:01  hajny
+    * 8.3 fixes (short target name in paths)
+
+  Revision 1.4  2004/10/25 15:38:41  peter
     * heap and heapsize removed
     * checkpointer fixes
 
diff --git a/compiler/systems/i_emx.pas b/compiler/systems/i_emx.pas
index f07d96e9f2..944d423154 100644
--- a/compiler/systems/i_emx.pas
+++ b/compiler/systems/i_emx.pas
@@ -41,7 +41,7 @@ unit i_emx;
             system       : system_i386_EMX;
             name         : 'OS/2 via EMX';
             shortname    : 'EMX';
-            flags        : [tf_need_export];
+            flags        : [tf_need_export,tf_use_8_3];
             cpu          : cpu_i386;
             unit_env     : 'EMXUNITS';
             extradefines : 'OS2';
@@ -115,7 +115,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.5  2004-10-25 15:38:41  peter
+  Revision 1.6  2004-12-28 20:43:01  hajny
+    * 8.3 fixes (short target name in paths)
+
+  Revision 1.5  2004/10/25 15:38:41  peter
     * heap and heapsize removed
     * checkpointer fixes
 
diff --git a/compiler/systems/i_go32v2.pas b/compiler/systems/i_go32v2.pas
index bd61a5a563..5351b711c4 100644
--- a/compiler/systems/i_go32v2.pas
+++ b/compiler/systems/i_go32v2.pas
@@ -33,7 +33,7 @@ unit i_go32v2;
             system       : system_i386_GO32V2;
             name         : 'GO32 V2 DOS extender';
             shortname    : 'Go32v2';
-            flags        : [];
+            flags        : [tf_use_8_3];
             cpu          : cpu_i386;
             unit_env     : 'GO32V2UNITS';
             extradefines : 'DPMI';
@@ -101,7 +101,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.4  2004-10-25 15:38:41  peter
+  Revision 1.5  2004-12-28 20:43:01  hajny
+    * 8.3 fixes (short target name in paths)
+
+  Revision 1.4  2004/10/25 15:38:41  peter
     * heap and heapsize removed
     * checkpointer fixes
 
diff --git a/compiler/systems/i_os2.pas b/compiler/systems/i_os2.pas
index 020c2ee519..3d66ca4bd2 100644
--- a/compiler/systems/i_os2.pas
+++ b/compiler/systems/i_os2.pas
@@ -41,7 +41,7 @@ unit i_os2;
             system       : system_i386_OS2;
             name         : 'OS/2';
             shortname    : 'OS2';
-            flags        : [tf_need_export];
+            flags        : [tf_need_export,tf_use_8_3];
             cpu          : cpu_i386;
             unit_env     : 'OS2UNITS';
             extradefines : '';
@@ -115,7 +115,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.6  2004-10-25 15:38:41  peter
+  Revision 1.7  2004-12-28 20:43:01  hajny
+    * 8.3 fixes (short target name in paths)
+
+  Revision 1.6  2004/10/25 15:38:41  peter
     * heap and heapsize removed
     * checkpointer fixes
 
diff --git a/compiler/systems/i_watcom.pas b/compiler/systems/i_watcom.pas
index 11b84863e8..c4b74c80f5 100644
--- a/compiler/systems/i_watcom.pas
+++ b/compiler/systems/i_watcom.pas
@@ -35,7 +35,7 @@ unit i_watcom;
             system       : system_i386_Watcom;
             name         : 'Watcom compatible DOS extenders';
             shortname    : 'WATCOM';
-            flags        : [];
+            flags        : [tf_use_8_3];
             cpu          : cpu_i386;
             unit_env     : 'WATCOMUNITS';
             extradefines : 'DPMI';
@@ -103,7 +103,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.5  2004-10-25 15:38:41  peter
+  Revision 1.6  2004-12-28 20:43:01  hajny
+    * 8.3 fixes (short target name in paths)
+
+  Revision 1.5  2004/10/25 15:38:41  peter
     * heap and heapsize removed
     * checkpointer fixes
 
diff --git a/compiler/systems/i_wdosx.pas b/compiler/systems/i_wdosx.pas
index 773fe0dfd0..475712a279 100644
--- a/compiler/systems/i_wdosx.pas
+++ b/compiler/systems/i_wdosx.pas
@@ -33,7 +33,7 @@ unit i_wdosx;
             system       : system_i386_wdosx;
             name         : 'WDOSX DOS extender';
             shortname    : 'WDOSX';
-            flags        : [];
+            flags        : [tf_use_8_3];
             cpu          : cpu_i386;
             unit_env     : 'WDOSXUNITS';
             extradefines : 'MSWINDOWS';
@@ -103,7 +103,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.7  2004-10-25 15:38:41  peter
+  Revision 1.8  2004-12-28 20:43:01  hajny
+    * 8.3 fixes (short target name in paths)
+
+  Revision 1.7  2004/10/25 15:38:41  peter
     * heap and heapsize removed
     * checkpointer fixes