diff --git a/client/djrandom_client/upload.py b/client/djrandom_client/upload.py
index 2c97be660ca7121b6e46514dcd3a9232a5fed14a..412643d1d3b3d9fdbeec7ac7dfc56626e4d3e714 100644
--- a/client/djrandom_client/upload.py
+++ b/client/djrandom_client/upload.py
@@ -4,6 +4,7 @@ import logging
 import mmap
 import os
 import optparse
+import socket
 import threading
 import time
 import urllib2
@@ -40,6 +41,7 @@ class Uploader(object):
         self.queue = Queue.Queue(1000)
         self.db = FileDatabase(db)
         self.opener = urllib2.build_opener(throttle.ThrottledHTTPHandler)
+        socket.setdefaulttimeout(60)
 
     def _get(self, url):
         req = urllib2.Request(self.server_url + url,