diff --git a/heapq/metadata.txt b/heapq/metadata.txt
new file mode 100644
index 00000000..84d67faa
--- /dev/null
+++ b/heapq/metadata.txt
@@ -0,0 +1,5 @@
+srctype = cpython
+type = module
+version = 0.9.1
+# Module uses in *some* functions, but we don't want to depend on it
+#depends = itertools
diff --git a/heapq/setup.py b/heapq/setup.py
index bf0c50e9..5f526d45 100644
--- a/heapq/setup.py
+++ b/heapq/setup.py
@@ -1,16 +1,18 @@
 import sys
-# Remove current dir from sys.path, otherwise distutils will peek up our
-# copy module instead of system.
+# 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-heapq',
-      version='0.9',
+      version='0.9.1',
       description='CPython heapq module ported to MicroPython',
+      long_description='This is a module ported from CPython standard library to be compatible with\nMicroPython interpreter. Usually, this means applying small patches for\nfeatures not supported (yet, or at all) in MicroPython. Sometimes, heavier\nchanges are required. Note that CPython modules are written with availability\nof vast resources in mind, and may not work for MicroPython ports with\nlimited heap. If you are affected by such a case, please help reimplement\nthe module from scratch.',
       url='https://github.com/micropython/micropython/issues/405',
       author='CPython Developers',
+      author_email='python-dev@python.org',
       maintainer='MicroPython Developers',
       maintainer_email='micro-python@googlegroups.com',
       license='Python',
-      install_requires=['micropython-itertools'],
       py_modules=['heapq'])