diff --git a/socket/metadata.txt b/socket/metadata.txt
new file mode 100644
index 00000000..ee35c824
--- /dev/null
+++ b/socket/metadata.txt
@@ -0,0 +1,4 @@
+srctype = micropython-lib
+type = module
+version = 0.0.2
+author = Paul Sokolovsky
diff --git a/socket/setup.py b/socket/setup.py
index d76895ce..eb187e37 100644
--- a/socket/setup.py
+++ b/socket/setup.py
@@ -1,24 +1,18 @@
 import sys
-# Remove current dir from sys.path, otherwise distutils will peek up our
+# Remove current dir from sys.path, otherwise setuptools will peek up our
 # module instead of system.
 sys.path.pop(0)
 from setuptools import setup
 
 
-def desc_dummy(name):
-    return 'Dummy %s module to MicroPython' % name
-def desc_cpython(name):
-    return 'CPython %s module ported to MicroPython' % name
-def desc_upython(name):
-    return '%s module for MicroPython' % name
-
-NAME = 'socket'
-
-setup(name='micropython-' + NAME,
-      version='0.0.1',
-      description=desc_upython(NAME),
+setup(name='micropython-socket',
+      version='0.0.2',
+      description='socket 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='MicroPython Developers',
+      author='Paul Sokolovsky',
       author_email='micro-python@googlegroups.com',
+      maintainer='MicroPython Developers',
+      maintainer_email='micro-python@googlegroups.com',
       license='MIT',
-      py_modules=[NAME])
+      py_modules=['socket'])