diff --git a/compiler/systems.pas b/compiler/systems.pas
index 293a0286d4..858364a30c 100644
--- a/compiler/systems.pas
+++ b/compiler/systems.pas
@@ -220,7 +220,9 @@ interface
        systems_netbsd  = [system_i386_netbsd,
                           system_m68k_netbsd,
                           system_powerpc_netbsd];
-       systems_openbsd = [system_i386_openbsd];
+       systems_openbsd = [system_i386_openbsd,
+                          system_m68k_openbsd,
+                          system_x86_64_openbsd];
 
        systems_bsd = systems_freebsd + systems_netbsd + systems_openbsd;
 
@@ -750,6 +752,10 @@ begin
     default_target(system_x86_64_freebsd);
     {$define default_target_set}
    {$endif}
+   {$ifdef openbsd}
+    default_target(system_x86_64_openbsd);
+    {$define default_target_set}
+   {$endif}
    {$ifdef solaris}
     default_target(system_x86_64_solaris);
     {$define default_target_set}