diff --git a/CHANGES b/CHANGES
index d18b204..7dd0514 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+3.0.5
+=====
+
+- Fixed OverflowError with ProcessPoolExecutor on Windows (regression introduced in 3.0.4)
+
+
 3.0.4
 =====
 
diff --git a/concurrent/futures/process.py b/concurrent/futures/process.py
index 812552b..7252841 100644
--- a/concurrent/futures/process.py
+++ b/concurrent/futures/process.py
@@ -232,7 +232,7 @@ def _queue_management_worker(executor_reference,
                 # some multiprocessing.Queue methods may deadlock on Mac OS
                 # X.
                 for p in processes:
-                    p.join(sys.maxint)
+                    p.join()
                 call_queue.close()
                 return
         del executor
diff --git a/setup.py b/setup.py
index dfad9f4..6961f35 100755
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ except ImportError:
     from distutils.core import setup
 
 setup(name='futures',
-      version='3.0.4',
+      version='3.0.5',
       description='Backport of the concurrent.futures package from Python 3.2',
       author='Brian Quinlan',
       author_email='brian@sweetapp.com',