diff --git a/modules/exploits/multi/misc/java_jdwp_debugger.rb b/modules/exploits/multi/misc/java_jdwp_debugger.rb
index bbdc068bc8..a9a7e53498 100644
--- a/modules/exploits/multi/misc/java_jdwp_debugger.rb
+++ b/modules/exploits/multi/misc/java_jdwp_debugger.rb
@@ -91,8 +91,8 @@ class MetasploitModule < Msf::Exploit::Remote
           ['URL', 'https://svn.nmap.org/nmap/scripts/jdwp-exec.nse'],
           ['URL', 'http://blog.ioactive.com/2014/04/hacking-java-debug-wire-protocol-or-how.html']
         ],
-      'Platform'       => %w{ linux win },
-      'Arch'           => ARCH_X86,
+      'Platform'       => %w{ linux win osx },
+      'Arch'           => [ARCH_X86, ARCH_X64],
       'Payload'        =>
         {
           'Space'        => 2048,
@@ -101,12 +101,17 @@ class MetasploitModule < Msf::Exploit::Remote
         },
       'Targets'        =>
         [
-          [ 'Linux x86 (Native Payload)',
+          [ 'Linux (Native Payload)',
             {
                 'Platform' => 'linux'
             }
           ],
-          [ 'Windows x86 (Native Payload)',
+          [ 'macOS (Native Payload)',
+            {
+                'Platform' => 'osx'
+            }
+          ],
+          [ 'Windows (Native Payload)',
             {
               'Platform' => 'win'
             }