diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..ee380e9
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+
+from setuptools import setup, find_packages
+
+
+setup(name='webrepl_cli',
+      version='0.20190413',
+      description='WebREPL client for MicroPython',
+      author=u'MicroPython Team',
+      author_email='contact@micropython.org',
+      url='https://github.com/micropython/webrepl',
+      entry_points={'console_scripts': [
+                            'webrepl-cli = webrepl_cli.cli:main'
+                        ]},
+      license="MIT",
+      keywords="micropython webrepl esp8266 esp32",
+      packages=find_packages(),
+      install_requires=[],
+      package_data={})
diff --git a/webrepl_cli/__init__.py b/webrepl_cli/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/webrepl_cli.py b/webrepl_cli/cli.py
similarity index 99%
rename from webrepl_cli.py
rename to webrepl_cli/cli.py
index 55a9eea..fd5a0bc 100755
--- a/webrepl_cli.py
+++ b/webrepl_cli/cli.py
@@ -7,7 +7,8 @@
     import usocket as socket
 except ImportError:
     import socket
-import websocket_helper
+
+from webrepl_cli import websocket_helper
 
 # Define to 1 to use builtin "uwebsocket" module of MicroPython
 USE_BUILTIN_UWEBSOCKET = 0
diff --git a/websocket_helper.py b/webrepl_cli/websocket_helper.py
similarity index 100%
rename from websocket_helper.py
rename to webrepl_cli/websocket_helper.py