diff --git a/pymysql/__init__.py b/pymysql/__init__.py
index 8a7b6bc..def5d31 100644
--- a/pymysql/__init__.py
+++ b/pymysql/__init__.py
@@ -23,7 +23,7 @@ THE SOFTWARE.
 
 '''
 
-VERSION = (0, 6, 4, None)
+VERSION = (0, 6, 5, None)
 
 from ._compat import text_type, JYTHON, IRONPYTHON
 from .constants import FIELD_TYPE
diff --git a/setup.py b/setup.py
index fc64a80..8581e1b 100755
--- a/setup.py
+++ b/setup.py
@@ -15,8 +15,8 @@ setup(
     download_url = 'https://github.com/PyMySQL/PyMySQL/tarball/pymysql-%s' % version,
     author='yutaka.matsubara',
     author_email='yutaka.matsubara@gmail.com',
-    maintainer='Marcel Rodrigues',
-    maintainer_email='marcelgmr@gmail.com',
+    maintainer='INADA Naoki',
+    maintainer_email='songofacandy@gmail.com',
     description='Pure-Python MySQL Driver',
     license="MIT",
     packages=find_packages(),