diff --git a/manage.py b/manage.py
index 8aed538d..b57431c8 100644
--- a/manage.py
+++ b/manage.py
@@ -10,7 +10,7 @@ manager = Manager()
 
 @manager.command
 def publish(with_tag=True):
-    """Publish current version to PyPi."""
+    """Publishg current version to PyPi."""
     os.system('python setup.py sdist upload')
     if with_tag:
         tag()
diff --git a/setup.py b/setup.py
index affa7fc6..3d578249 100644
--- a/setup.py
+++ b/setup.py
@@ -2,18 +2,20 @@
 `Objects` setup script.
 """
 
+import os
 from setuptools import setup
+from setuptools import Command
 
 
-DESCRIPTION = 'Dependency management tool for Python projects'
+SHORT_DESCRIPTION = 'Dependency management tool for Python projects'
 
 
 # Getting description.
 with open('README.rst') as readme_file:
     description = readme_file.read()
 
-    # Removing duplicated description
-    description = description.replace(DESCRIPTION, '')
+    # Removing duplicated short description.
+    description = description.replace(SHORT_DESCRIPTION, '')
 
 
 # Getting requirements.
@@ -26,48 +28,68 @@ with open('VERSION') as version:
     version = version.read().strip()
 
 
-if __name__ == '__main__':
-    setup(
-        name='Objects',
-        version=version,
-        description='Dependency management tool for Python projects',
-        long_description=description,
-        author='Roman Mogilatov',
-        author_email='rmogilatov@gmail.com',
-        maintainer='Roman Mogilatov',
-        maintainer_email='rmogilatov@gmail.com',
-        url='https://github.com/rmk135/objects',
-        license='BSD New',
-        packages=['objects'],
-        zip_safe=True,
-        install_requires=requirements,
-        keywords=['Dependency management',
-                  'Dependency injection',
-                  'Dependency injection container',
-                  'DI',
-                  'DIC',
-                  'Dependency injector',
-                  'Inversion of Control',
-                  'Inversion of Control container',
-                  'IoC',
-                  'IoC container'],
-        classifiers=[
-            'Development Status :: 3 - Alpha',
-            'Intended Audience :: Developers',
-            'License :: OSI Approved :: BSD License',
-            'Operating System :: OS Independent',
-            'Programming Language :: Python',
-            'Programming Language :: Python :: 2',
-            'Programming Language :: Python :: 2.6',
-            'Programming Language :: Python :: 2.7',
-            'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.2',
-            'Programming Language :: Python :: 3.3',
-            'Programming Language :: Python :: 3.4',
-            'Programming Language :: Python :: Implementation :: CPython',
-            'Programming Language :: Python :: Implementation :: PyPy',
-            'Topic :: Software Development',
-            'Topic :: Software Development :: Libraries',
-            'Topic :: Software Development :: Libraries :: Python Modules',
-        ]
-    )
+class PublishCommand(Command):
+
+    """Setuptools `publish` command."""
+
+    description = "Publish current distribution to PyPi and create tag"
+    user_options = tuple()
+
+    def initialize_options(self):
+        """Init options."""
+
+    def finalize_options(self):
+        """Finalize options."""
+
+    def run(self):
+        """Command execution."""
+        os.system('python setup.py sdist upload')
+        os.system('git tag -a {0} -m \'version {0}\''.format(version))
+        os.system('git push --tags')
+
+
+setup(name='Objects',
+      version=version,
+      description=SHORT_DESCRIPTION,
+      long_description=description,
+      author='Roman Mogilatov',
+      author_email='rmogilatov@gmail.com',
+      maintainer='Roman Mogilatov',
+      maintainer_email='rmogilatov@gmail.com',
+      url='https://github.com/rmk135/objects',
+      license='BSD New',
+      packages=['objects'],
+      zip_safe=True,
+      install_requires=requirements,
+      cmdclass={
+          'publish': PublishCommand,
+      },
+      keywords=['Dependency management',
+                'Dependency injection',
+                'Dependency injection container',
+                'DI',
+                'DIC',
+                'Dependency injector',
+                'Inversion of Control',
+                'Inversion of Control container',
+                'IoC',
+                'IoC container'],
+      classifiers=[
+          'Development Status :: 3 - Alpha',
+          'Intended Audience :: Developers',
+          'License :: OSI Approved :: BSD License',
+          'Operating System :: OS Independent',
+          'Programming Language :: Python',
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 2.6',
+          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.2',
+          'Programming Language :: Python :: 3.3',
+          'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: Implementation :: CPython',
+          'Programming Language :: Python :: Implementation :: PyPy',
+          'Topic :: Software Development',
+          'Topic :: Software Development :: Libraries',
+          'Topic :: Software Development :: Libraries :: Python Modules',
+      ])