diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 04ea809127..61a0f09f43 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -947,8 +947,13 @@ ange-ftp-gateway-ftp-program-name
 Some AT&T folks claim to use something called `pftp' here."
   :group 'ange-ftp
   :type 'string)
+(defcustom imap-read-timeout (if (memq system-type '(windows-nt cygwin))
+				 1.0
+			       0.1)
 
-(defcustom ange-ftp-ftp-program-args '("-i" "-n" "-g" "-v")
+(defcustom ange-ftp-ftp-program-args (if (eq system-type 'darwin)
+  '("-i" "-n" "-g" "-v" "-e") ; for GNU inetutils
+  '("-i" "-n" "-g" "-v"))
   "A list of arguments passed to the FTP program when started."
   :group 'ange-ftp
   :type '(repeat string))