diff --git a/umqtt.robust/README.rst b/umqtt.robust/README.rst
new file mode 100644
index 00000000..dabc7e5f
--- /dev/null
+++ b/umqtt.robust/README.rst
@@ -0,0 +1,8 @@
+umqtt.robust
+============
+
+umqtt is a simple MQTT client for MicroPython. (Note that it uses some
+MicroPython shortcuts and doesn't work with CPython). It consists of
+two submodules: umqtt.simple and umqtt.robust. umqtt.robust is built
+on top of umqtt.simple and adds auto-reconnect facilities for some of
+networking errors.
diff --git a/umqtt.robust/metadata.txt b/umqtt.robust/metadata.txt
new file mode 100644
index 00000000..f8f08dc6
--- /dev/null
+++ b/umqtt.robust/metadata.txt
@@ -0,0 +1,6 @@
+srctype = micropython-lib
+type = package
+version = 1.0
+author = Paul Sokolovsky
+desc = Lightweight MQTT client for MicroPython ("robust" version).
+long_desc = README.rst
diff --git a/umqtt.robust/setup.py b/umqtt.robust/setup.py
new file mode 100644
index 00000000..c57b5006
--- /dev/null
+++ b/umqtt.robust/setup.py
@@ -0,0 +1,18 @@
+import sys
+# Remove current dir from sys.path, otherwise setuptools will peek up our
+# module instead of system.
+sys.path.pop(0)
+from setuptools import setup
+
+
+setup(name='micropython-umqtt.robust',
+      version='1.0',
+      description='Lightweight MQTT client for MicroPython ("robust" version).',
+      long_description=open('README.rst').read(),
+      url='https://github.com/micropython/micropython/issues/405',
+      author='Paul Sokolovsky',
+      author_email='micro-python@googlegroups.com',
+      maintainer='MicroPython Developers',
+      maintainer_email='micro-python@googlegroups.com',
+      license='MIT',
+      packages=['umqtt'])