diff --git a/itertools/metadata.txt b/itertools/metadata.txt
new file mode 100644
index 00000000..a90b2ef3
--- /dev/null
+++ b/itertools/metadata.txt
@@ -0,0 +1,3 @@
+srctype = micropython-lib
+type = module
+version = 0.1.1
diff --git a/itertools/setup.py b/itertools/setup.py
index de6b625b..990579d7 100644
--- a/itertools/setup.py
+++ b/itertools/setup.py
@@ -1,10 +1,18 @@
-from distutils.core import setup
+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-itertools',
-      version='0.1',
+      version='0.1.1',
       description='itertools module for MicroPython',
+      long_description="This is a module reimplemented specifically for MicroPython standard library,\nwith efficient and lean design in mind. Note that this module is likely work\nin progress and likely supports just a subset of CPython's corresponding\nmodule. Please help with the development if you are interested in this\nmodule.",
       url='https://github.com/micropython/micropython/issues/405',
-      author='Paul Sokolovsky',
+      author='MicroPython Developers',
       author_email='micro-python@googlegroups.com',
+      maintainer='MicroPython Developers',
+      maintainer_email='micro-python@googlegroups.com',
       license='MIT',
       py_modules=['itertools'])