diff --git a/src/ChangeLog b/src/ChangeLog
index a23ba954..de220834 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-14  Jan Prikryl  <prikryl@cg.tuwien.ac.at>
+
+	* retr.c (retrieve_url): Consistently strdup opt.referer when
+	setting u->referer.
+
 2000-06-09  Dan Harkless  <dan-wget@dilvish.speed.net>
 
 	* main.c (print_help): --help output for --waitretry was over 80 cols.
diff --git a/src/retr.c b/src/retr.c
index 81cf5b73..dd19b1fe 100644
--- a/src/retr.c
+++ b/src/retr.c
@@ -322,10 +322,14 @@ retrieve_url (const char *origurl, char **file, char **newloc,
   /* Set the referer.  */
   if (refurl)
     u->referer = xstrdup (refurl);
-  else {
-    u->referer = opt.referer;
-  }
-  
+  else
+    {
+      if (opt.referer)
+	u->referer = xstrdup (opt.referer);
+      else
+	u->referer = NULL;
+    }
+
   local_use_proxy = USE_PROXY_P (u);
   if (local_use_proxy)
     {