diff --git a/compiler/x86/agx86nsm.pas b/compiler/x86/agx86nsm.pas
index 9d86dd6d41..9aa3c10be3 100644
--- a/compiler/x86/agx86nsm.pas
+++ b/compiler/x86/agx86nsm.pas
@@ -972,6 +972,13 @@ interface
                 AsmWriteln(#9#9'DB'#9'09bh')
                else
                 begin
+{$ifdef i8086}
+                  { nickysn note: I don't know if the 187 requires FWAIT before
+                    every instruction like the 8087, so I'm including it just in case }
+                  if (current_settings.cputype<=cpu_186) and
+                      requires_fwait_on_8087(fixed_opcode) then
+                    AsmWriteln(#9#9'DB'#9'09bh');
+{$endif i8086}
 {$ifndef i8086}
                   { We need to explicitely set
                     word prefix to get selectors