diff --git a/compiler/i8086/n8086util.pas b/compiler/i8086/n8086util.pas
index da19bfebf9..7b64a99632 100644
--- a/compiler/i8086/n8086util.pas
+++ b/compiler/i8086/n8086util.pas
@@ -47,7 +47,8 @@ implementation
   class procedure ti8086nodeutils.InsertMemorySizes;
     begin
       inherited;
-      InsertStackSegment;
+      if current_settings.x86memorymodel<>mm_tiny then
+        InsertStackSegment;
     end;
 
 
diff --git a/rtl/msdos/prt0comn.asm b/rtl/msdos/prt0comn.asm
index c968eb5a16..c7bc3010d7 100644
--- a/rtl/msdos/prt0comn.asm
+++ b/rtl/msdos/prt0comn.asm
@@ -53,11 +53,13 @@
         extern __nearheap_start
         extern __nearheap_end
 
-%ifdef __FAR_DATA__
+%ifndef __TINY__
+    %ifdef __FAR_DATA__
         extern ___stack
-%endif
-%ifdef __NEAR_DATA__
+    %endif
+    %ifdef __NEAR_DATA__
         extern ___stacktop
+    %endif
 %endif
 
         extern __SaveInt00