diff --git a/java/meterpreter/stdapi/src/main/java/com/metasploit/meterpreter/stdapi/stdapi_sys_process_execute.java b/java/meterpreter/stdapi/src/main/java/com/metasploit/meterpreter/stdapi/stdapi_sys_process_execute.java
index 7707c7db2..4bec2f964 100644
--- a/java/meterpreter/stdapi/src/main/java/com/metasploit/meterpreter/stdapi/stdapi_sys_process_execute.java
+++ b/java/meterpreter/stdapi/src/main/java/com/metasploit/meterpreter/stdapi/stdapi_sys_process_execute.java
@@ -65,10 +65,69 @@ public int execute(Meterpreter meterpreter, TLVPacket request, TLVPacket respons
         return ERROR_SUCCESS;
     }
 
+    // On Windows, Java quote-escapes _some_ arguments (like those with spaces), but doesn't deal correctly with some
+    // edge cases; e.g. empty strings, strings that already have quotes.
+    protected String escapeArg(String arg) {
+        if (arg == null) {
+            return null;
+        }
+        String osName = System.getProperty("os.name");
+        if (osName != null && osName.toLowerCase().contains("windows")) {
+            if (arg.equals("")) {
+                return "\"\"";
+            } else {
+                StringBuilder sb = new StringBuilder();
+                int numBackslashes = 0;
+                boolean needsQuoting = false;
+                for (int i = 0; i < arg.length(); i++) {
+                    char c = arg.charAt(i);
+                    switch (c) {
+                        case '"': {
+                            for (int nb = 0; nb < numBackslashes; nb++) {
+                                sb.append('\\');
+                            }
+                            numBackslashes = 0;
+                            sb.append('\\');
+                            break;
+                        }
+                        case '\\': {
+                            numBackslashes++;
+                            break;
+                        }
+                        case ' ':
+                        case '\t':
+                        case (char)11:
+                        {
+                            needsQuoting = true;
+                            numBackslashes = 0;
+                            break;
+                        }
+                        default: {
+                            numBackslashes = 0;
+                            break;
+                        }
+                    }
+                    sb.append(c);
+                }
+                if (needsQuoting) {
+                    for (int nb = 0; nb < numBackslashes; nb++) {
+                        sb.append('\\');
+                    }
+                    return "\"" + sb.toString() + "\"";
+                }
+                return sb.toString();
+            }
+        } else {
+            return arg;
+        }
+    }
+
     protected Process execute(String cmd, ArrayList<String> args) throws IOException {
         ArrayList<String> cmdAndArgs = new ArrayList<String>();
         cmdAndArgs.add(cmd);
-        cmdAndArgs.addAll(args);
+        for (String arg : args) {
+            cmdAndArgs.add(escapeArg(arg));
+        }
         ProcessBuilder builder = new ProcessBuilder(cmdAndArgs);
         builder.directory(Loader.getCWD());
         return builder.start();