diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
index b1f60cdad77b..95b297108f2d 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
@@ -116,13 +116,6 @@ public class GenericDebuggerRunner extends JavaPatchableProgramRunner<GenericDeb
     return DebuggerManagerImpl.createDebugParameters(javaParameters, debuggerSettings, false);
   }
 
-  private static void runCustomPatchers(JavaParameters javaParameters, RunnerSettings settings, Executor executor) {
-    final RunProfile profile = settings.getRunProfile();
-    for (JavaProgramPatcher patcher : JavaProgramPatcher.EP_NAME.getExtensions()) {
-      patcher.patchJavaParameters(executor, profile, javaParameters);
-    }
-  }
-
   public SettingsEditor<GenericDebuggerRunnerSettings> getSettingsEditor(final Executor executor, RunConfiguration configuration) {
     if (configuration instanceof RunConfigurationWithRunnerSettings) {
       if (((RunConfigurationWithRunnerSettings)configuration).isSettingsNeeded()) {
diff --git a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java
index 2387443ee892..d03685e64d18 100644
--- a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java
+++ b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java
@@ -82,7 +82,9 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
     ExecutionResult executionResult;
     boolean shouldAddDefaultActions = true;
     if (state instanceof JavaCommandLine) {
-      patch(((JavaCommandLine)state).getJavaParameters(), state.getRunnerSettings(), true);
+      final JavaParameters parameters = ((JavaCommandLine)state).getJavaParameters();
+      patch(parameters, state.getRunnerSettings(), true);
+      runCustomPatchers(parameters, state.getRunnerSettings(), executor);
       final ProcessProxy proxy = ProcessProxyFactory.getInstance().createCommandLineProxy((JavaCommandLine)state);
       executionResult = state.execute(executor, this);
       if (proxy != null && executionResult != null) {
diff --git a/java/execution/openapi/src/com/intellij/execution/runners/JavaPatchableProgramRunner.java b/java/execution/openapi/src/com/intellij/execution/runners/JavaPatchableProgramRunner.java
index 4dd7aac1a242..15994339c7f1 100644
--- a/java/execution/openapi/src/com/intellij/execution/runners/JavaPatchableProgramRunner.java
+++ b/java/execution/openapi/src/com/intellij/execution/runners/JavaPatchableProgramRunner.java
@@ -16,7 +16,9 @@
 package com.intellij.execution.runners;
 
 import com.intellij.execution.ExecutionException;
+import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.JavaParameters;
+import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.configurations.RunnerSettings;
 import com.intellij.openapi.util.JDOMExternalizable;
 
@@ -27,5 +29,11 @@ public abstract class JavaPatchableProgramRunner<Settings extends JDOMExternaliz
 
   public abstract void patch(JavaParameters javaParameters, RunnerSettings settings, final boolean beforeExecution) throws ExecutionException;
 
-                                      
+
+  protected static void runCustomPatchers(JavaParameters javaParameters, RunnerSettings settings, Executor executor) {
+    final RunProfile profile = settings.getRunProfile();
+    for (JavaProgramPatcher patcher : JavaProgramPatcher.EP_NAME.getExtensions()) {
+      patcher.patchJavaParameters(executor, profile, javaParameters);
+    }
+  }
 }
diff --git a/java/debugger/impl/src/com/intellij/execution/runners/JavaProgramPatcher.java b/java/execution/openapi/src/com/intellij/execution/runners/JavaProgramPatcher.java
similarity index 84%
rename from java/debugger/impl/src/com/intellij/execution/runners/JavaProgramPatcher.java
rename to java/execution/openapi/src/com/intellij/execution/runners/JavaProgramPatcher.java
index 50b5a48d33de..f12af7ee613f 100644
--- a/java/debugger/impl/src/com/intellij/execution/runners/JavaProgramPatcher.java
+++ b/java/execution/openapi/src/com/intellij/execution/runners/JavaProgramPatcher.java
@@ -6,7 +6,7 @@ import com.intellij.execution.configurations.RunProfile;
 import com.intellij.openapi.extensions.ExtensionPointName;
 
 /**
- * For now, used only to patch the debugged run configuration. May be extended to other executors when needed.
+ * Patch Java command line before running/debugging
  *
  * @author peter
  */