diff --git a/src/ChangeLog b/src/ChangeLog
index ceb7b6da..d9b79e62 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-06  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+	* gen_sslfunc.c (ssl_init_prng): Allow the user to disable EGD by
+	setting egd_file it to empty string.
+
+	* main.c (main): Change the option name from --sslegdsock to
+	--egd-file.
+
 2001-12-06  Hrvoje Niksic  <hniksic@arsdigita.com>
 
 	* gen_sslfunc.c (ssl_init_prng): Make the printed message
diff --git a/src/gen_sslfunc.c b/src/gen_sslfunc.c
index 9b3ebe07..d28f1ad8 100644
--- a/src/gen_sslfunc.c
+++ b/src/gen_sslfunc.c
@@ -73,7 +73,7 @@ ssl_init_prng (void)
     return;
 
   /* Get random data from EGD if opt.sslegdsock was set.  */
-  if (opt.sslegdsock)
+  if (opt.sslegdsock && *opt.sslegdsock)
     RAND_egd (opt.sslegdsock);
 
   if (RAND_status ())
diff --git a/src/init.c b/src/init.c
index 4d82e095..22322910 100644
--- a/src/init.c
+++ b/src/init.c
@@ -179,7 +179,7 @@ static struct {
 #ifdef HAVE_SSL
   { "sslcertfile",	&opt.sslcertfile,	cmd_file },
   { "sslcertkey",	&opt.sslcertkey,	cmd_file },
-  { "sslegdsock",	&opt.sslegdsock,	cmd_file },
+  { "egdfile",		&opt.sslegdsock,	cmd_file },
 #endif /* HAVE_SSL */
   { "timeout",		&opt.timeout,		cmd_time },
   { "timestamping",	&opt.timestamping,	cmd_boolean },
@@ -670,6 +670,9 @@ cmd_file (const char *com, const char *val, void *closure)
   char **pstring = (char **)closure;
 
   FREE_MAYBE (*pstring);
+
+  /* #### If VAL is empty, perhaps should set *CLOSURE to NULL.  */
+
   if (!enable_tilde_expansion || !(*val == '~' && *(val + 1) == '/'))
     {
     noexpand:
diff --git a/src/main.c b/src/main.c
index cf97cd48..1933cfc5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -150,7 +150,7 @@ Logging and input file:\n\
   -B,  --base=URL             prepends URL to relative links in -F -i file.\n\
        --sslcertfile=FILE     optional client certificate.\n\
        --sslcertkey=KEYFILE   optional keyfile for this certificate.\n\
-       --sslegdsock=FILE      socket to the egd daemon(random data source).\n\
+       --egd-file=FILE        file name of the EGD socket.\n\
 \n"), stdout);
   fputs (_("\
 Download:\n\
@@ -324,7 +324,7 @@ main (int argc, char *const *argv)
 #ifdef HAVE_SSL
     { "sslcertfile", required_argument, NULL, 158 },
     { "sslcertkey", required_argument, NULL, 159 },
-    { "sslegdsock", required_argument, NULL, 166 },
+    { "egd-file", required_argument, NULL, 166 },
 #endif /* HAVE_SSL */
     { "wait", required_argument, NULL, 'w' },
     { "waitretry", required_argument, NULL, 152 },
@@ -546,7 +546,7 @@ GNU General Public License for more details.\n"));
 	  setval ("sslcertkey", optarg);
 	  break;
 	case 166:
-	  setval ("sslegdsock", optarg);
+	  setval ("egdfile", optarg);
 	  break;
 #endif /* HAVE_SSL */
 	case 'A':