diff --git a/python/setup.py b/python/setup.py
index 67ff74c4..d079e3e3 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # coding: utf-8
-version = (0, 1, 5, 'final')
+version = (0, 1, 6, 'final')
 
 import os
 from glob import glob
@@ -19,6 +19,9 @@ except ImportError:
 f = open('msgpack/__version__.py', 'w')
 f.write("version = %r\n" % (version,))
 f.close()
+version_str = '.'.join(str(x) for x in version[:3])
+if len(version) > 3 and version[3] != 'final':
+    version_str += version[3]
 
 # take care of extension modules.
 if have_cython:
@@ -57,7 +60,7 @@ What's MessagePack? (from http://msgpack.sourceforge.net/)
 setup(name='msgpack-python',
       author='INADA Naoki',
       author_email='songofacandy@gmail.com',
-      version=''.join(str(x) for x in version),
+      version=version_str,
       cmdclass={'build_ext': build_ext, 'sdist': Sdist},
       ext_modules=[msgpack_mod],
       packages=['msgpack'],