diff --git a/plugins/terminal/lib/JPty.jar b/plugins/terminal/lib/JPty.jar
deleted file mode 100644
index 3613a01f58ae..000000000000
Binary files a/plugins/terminal/lib/JPty.jar and /dev/null differ
diff --git a/plugins/terminal/lib/pty4j-0.2.jar b/plugins/terminal/lib/pty4j-0.2.jar
new file mode 100644
index 000000000000..44b238387d60
Binary files /dev/null and b/plugins/terminal/lib/pty4j-0.2.jar differ
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
index 7a4626bd509d..8d49b030a0eb 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
@@ -5,13 +5,15 @@ import com.intellij.execution.process.*;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Consumer;
 import com.intellij.util.containers.HashMap;
-import com.jediterm.pty.PtyProcess;
 import com.jediterm.pty.PtyProcessTtyConnector;
 import com.jediterm.terminal.TtyConnector;
+import com.pty4j.PtyProcess;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.Charset;
 import java.util.Map;
@@ -36,7 +38,12 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
   protected PtyProcess createProcess() throws ExecutionException {
     Map<String, String> envs = new HashMap<String, String>(System.getenv());
     envs.put("TERM", "xterm");
-    return new PtyProcess(myCommand[0], myCommand, envs);
+    try {
+      return PtyProcess.exec(myCommand, envs, null);
+    }
+    catch (IOException e) {
+      throw new ExecutionException(e);
+    }
   }
 
   @Override
@@ -51,7 +58,7 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
 
   @Override
   protected String getTerminalConnectionName(PtyProcess process) {
-    return process.getCommandLineString();
+    return StringUtil.join(myCommand);
   }
 
   private static class PtyProcessHandler extends ProcessHandler implements TaskExecutor {
diff --git a/plugins/terminal/terminal.iml b/plugins/terminal/terminal.iml
index 20a7e2ae43ff..a334163c613a 100644
--- a/plugins/terminal/terminal.iml
+++ b/plugins/terminal/terminal.iml
@@ -20,9 +20,9 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="jpty">
+      <library name="pty4j">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/JPty.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/pty4j-0.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />