diff --git a/pymongo/mongo_client.py b/pymongo/mongo_client.py
index 554fa1b902..3ab77b7afd 100644
--- a/pymongo/mongo_client.py
+++ b/pymongo/mongo_client.py
@@ -217,6 +217,7 @@ def __init__(self, host=None, port=None, max_pool_size=10,
             host = [host]
         if port is None:
             port = self.PORT
+        port = int(port)
         if not isinstance(port, int):
             raise TypeError("port must be an instance of int")
 
diff --git a/setup.py b/setup.py
index 34e151c23f..ee53dc5973 100755
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@
 from distutils.errors import DistutilsPlatformError, DistutilsExecError
 from distutils.core import Extension
 
-version = "2.5+"
+version = "2.5.1"
 
 f = open("README.rst")
 try: