diff --git a/plugins/terminal/lib/jediterm-pty-0.04.jar b/plugins/terminal/lib/jediterm-pty-0.04.jar
deleted file mode 100644
index 59ec12ca454b..000000000000
Binary files a/plugins/terminal/lib/jediterm-pty-0.04.jar and /dev/null differ
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java
index cc1d6c85c8ca..a178adbe5210 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java
@@ -18,7 +18,7 @@ import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.util.ui.UIUtil;
-import com.jediterm.emulator.TtyConnector;
+import com.jediterm.terminal.TtyConnector;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminal.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminal.java
index f605ffbb0511..7c19c78285a9 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminal.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminal.java
@@ -8,11 +8,11 @@ import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.ui.components.JBScrollBar;
 import com.intellij.util.containers.HashMap;
-import com.jediterm.emulator.display.BackBuffer;
-import com.jediterm.emulator.display.LinesBuffer;
-import com.jediterm.emulator.display.StyleState;
-import com.jediterm.emulator.ui.SwingJediTerminal;
-import com.jediterm.emulator.ui.SwingTerminalPanel;
+import com.jediterm.terminal.display.BackBuffer;
+import com.jediterm.terminal.display.LinesBuffer;
+import com.jediterm.terminal.display.StyleState;
+import com.jediterm.terminal.ui.SwingJediTerminal;
+import com.jediterm.terminal.ui.SwingTerminalPanel;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java
index ebb5dee870f7..c7cf51faa3c0 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java
@@ -25,11 +25,11 @@ package org.jetbrains.plugins.terminal;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.ide.CopyPasteManager;
 import com.intellij.util.ui.GraphicsUtil;
-import com.jediterm.emulator.TextStyle;
-import com.jediterm.emulator.display.BackBuffer;
-import com.jediterm.emulator.display.LinesBuffer;
-import com.jediterm.emulator.display.StyleState;
-import com.jediterm.emulator.ui.SwingTerminalPanel;
+import com.jediterm.terminal.TextStyle;
+import com.jediterm.terminal.display.BackBuffer;
+import com.jediterm.terminal.display.LinesBuffer;
+import com.jediterm.terminal.display.StyleState;
+import com.jediterm.terminal.ui.SwingTerminalPanel;
 
 import java.awt.*;
 import java.awt.datatransfer.DataFlavor;
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
index f633024cd128..9b5af831cd23 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
@@ -7,9 +7,9 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.Consumer;
 import com.intellij.util.containers.HashMap;
-import com.jediterm.emulator.TtyConnector;
 import com.jediterm.pty.PtyProcess;
 import com.jediterm.pty.PtyProcessTtyConnector;
+import com.jediterm.terminal.TtyConnector;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.OutputStream;
diff --git a/plugins/terminal/terminal.iml b/plugins/terminal/terminal.iml
index d3d1e766dbdb..679498b504bc 100644
--- a/plugins/terminal/terminal.iml
+++ b/plugins/terminal/terminal.iml
@@ -48,6 +48,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="jediterm" />
   </component>
 </module>