diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index f485e9a7b0..6ff5d5a941 100644
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -469,9 +469,15 @@ bool wxFTP::RmFile(const wxString& path)
 class wxInputFTPStream : public wxSocketInputStream
 {
 public:
-    wxInputFTPStream(wxFTP *ftp_clt, wxSocketBase *sock)
-        : wxSocketInputStream(*sock), m_ftp(ftp_clt)
+    wxInputFTPStream(wxFTP *ftp, wxSocketBase *sock)
+        : wxSocketInputStream(*sock)
     {
+        m_ftp = ftp;
+
+        // FIXME make the timeout configurable
+
+        // set a shorter than default timeout
+        m_i_socket->SetTimeout(60); // 1 minute
     }
 
     size_t GetSize() const { return m_ftpsize; }