diff --git a/python/setup.py b/python/setup.py
index c48be14e..66cf27e8 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -1,16 +1,41 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-from distutils.core import setup, Extension
-#from Cython.Distutils import build_ext
 import os
+from glob import glob
+from distutils.core import setup, Extension
+from distutils.command.sdist import sdist
+
+try:
+    from Cython.Distutils import build_ext
+    import Cython.Compiler.Main as cython_compiler
+    have_cython = True
+except ImportError:
+    from distutils.command.build_ext import build_ext
+    have_cython = False
 
 version = '0.2.0dev'
 
+# take care of extension modules.
+if have_cython:
+    sources = ['msgpack/_msgpack.pyx']
+
+    class Sdist(sdist):
+        def __init__(self, *args, **kwargs):
+            for src in glob('msgpack/*.pyx'):
+                cython_compiler.compile(glob('msgpack/*.pyx'),
+                                        cython_compiler.default_options)
+            sdist.__init__(self, *args, **kwargs)
+else:
+    sources = ['msgpack/_msgpack.c']
+
+    Sdist = sdist
+
 msgpack_mod = Extension('msgpack._msgpack',
-                        #sources=['msgpack/_msgpack.pyx']
-                        sources=['msgpack/_msgpack.c']
+                        sources=sources,
                         )
+del sources
+
 
 desc = 'MessagePack (de)serializer.'
 long_desc = desc + """
@@ -26,14 +51,15 @@ What's MessagePack? (from http://msgpack.sourceforge.jp/)
 """
 
 setup(name='msgpack',
-      author='Naoki INADA',
+      author='INADA Naoki',
       author_email='songofacandy@gmail.com',
       version=version,
-      #cmdclass={'build_ext': build_ext},
+      cmdclass={'build_ext': build_ext, 'sdist': Sdist},
       ext_modules=[msgpack_mod],
       packages=['msgpack'],
       description=desc,
       long_description=long_desc,
+      url="http://msgpack.sourceforge.jp/",
       classifiers=[
           'Development Status :: 4 - Beta',
           'Intended Audience :: Developers',
diff --git a/python/setup_dev.py b/python/setup_dev.py
deleted file mode 100755
index 66cf27e8..00000000
--- a/python/setup_dev.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-import os
-from glob import glob
-from distutils.core import setup, Extension
-from distutils.command.sdist import sdist
-
-try:
-    from Cython.Distutils import build_ext
-    import Cython.Compiler.Main as cython_compiler
-    have_cython = True
-except ImportError:
-    from distutils.command.build_ext import build_ext
-    have_cython = False
-
-version = '0.2.0dev'
-
-# take care of extension modules.
-if have_cython:
-    sources = ['msgpack/_msgpack.pyx']
-
-    class Sdist(sdist):
-        def __init__(self, *args, **kwargs):
-            for src in glob('msgpack/*.pyx'):
-                cython_compiler.compile(glob('msgpack/*.pyx'),
-                                        cython_compiler.default_options)
-            sdist.__init__(self, *args, **kwargs)
-else:
-    sources = ['msgpack/_msgpack.c']
-
-    Sdist = sdist
-
-msgpack_mod = Extension('msgpack._msgpack',
-                        sources=sources,
-                        )
-del sources
-
-
-desc = 'MessagePack (de)serializer.'
-long_desc = desc + """
-
-MessagePack_ (de)serializer for Python.
-
-.. _MessagePack: http://msgpack.sourceforge.jp/
-
-What's MessagePack? (from http://msgpack.sourceforge.jp/)
-
- MessagePack is a binary-based efficient data interchange format that is
- focused on high performance. It is like JSON, but very fast and small.
-"""
-
-setup(name='msgpack',
-      author='INADA Naoki',
-      author_email='songofacandy@gmail.com',
-      version=version,
-      cmdclass={'build_ext': build_ext, 'sdist': Sdist},
-      ext_modules=[msgpack_mod],
-      packages=['msgpack'],
-      description=desc,
-      long_description=long_desc,
-      url="http://msgpack.sourceforge.jp/",
-      classifiers=[
-          'Development Status :: 4 - Beta',
-          'Intended Audience :: Developers',
-          'License :: OSI Approved :: Apache Software License',
-          ]
-      )