diff --git a/setup.py b/setup.py
index 7fdafa5aa..f43a1b89f 100755
--- a/setup.py
+++ b/setup.py
@@ -291,7 +291,7 @@ def main():
         url='https://github.com/xonsh/xonsh',
         platforms='Cross Platform',
         classifiers=['Programming Language :: Python :: 3'],
-        packages=['xonsh', 'xonsh.ply', 'xonsh.ptk', 'xonsh.parsers',
+        packages=['xonsh', 'xonsh.ply.ply', 'xonsh.ptk', 'xonsh.parsers',
                   'xonsh.xoreutils', 'xontrib',
                   'xonsh.completers', 'xonsh.prompt'],
         package_dir={'xonsh': 'xonsh', 'xontrib': 'xontrib'},
diff --git a/tests/test_lexer.py b/tests/test_lexer.py
index 0f7a85bb4..4c51a8d54 100644
--- a/tests/test_lexer.py
+++ b/tests/test_lexer.py
@@ -12,7 +12,7 @@ import pytest
 try:
     from ply.lex import LexToken
 except ImportError:
-    from xonsh.ply.lex import LexToken
+    from xonsh.ply.ply.lex import LexToken
 
 
 from xonsh.lexer import Lexer
diff --git a/xonsh/lexer.py b/xonsh/lexer.py
index b71169f6e..9f37758fa 100644
--- a/xonsh/lexer.py
+++ b/xonsh/lexer.py
@@ -9,7 +9,7 @@ import keyword as kwmod
 try:
     from ply.lex import LexToken
 except ImportError:
-    from xonsh.ply.lex import LexToken
+    from xonsh.ply.ply.lex import LexToken
 
 from xonsh.lazyasd import lazyobject
 from xonsh.platform import PYTHON_VERSION_INFO
diff --git a/xonsh/parsers/base.py b/xonsh/parsers/base.py
index aa47995f1..d3180d383 100644
--- a/xonsh/parsers/base.py
+++ b/xonsh/parsers/base.py
@@ -10,7 +10,7 @@ from collections import Iterable, Sequence, Mapping
 try:
     from ply import yacc
 except ImportError:
-    from xonsh.ply import yacc
+    from xonsh.ply.ply import yacc
 
 from xonsh import ast
 from xonsh.ast import has_elts, xonsh_call
diff --git a/xonsh/xonfig.py b/xonsh/xonfig.py
index 05160b7e5..df918efb6 100644
--- a/xonsh/xonfig.py
+++ b/xonsh/xonfig.py
@@ -13,7 +13,7 @@ import contextlib
 try:
     import ply
 except ImportError:
-    from xonsh import ply
+    from xonsh.ply import ply
 
 import xonsh.wizard as wiz
 from xonsh import __version__ as XONSH_VERSION