diff --git a/ChangeLog b/ChangeLog
index 9b452863..f913b48a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-05  Micah Cowan  <micah@cowan.name>
+
+	* NEWS: Reword warnings regarding --content-disposition.
+
 2007-11-28  Micah Cowan  <micah@cowan.name>
 
 	* Makefile.am, README, autogen.sh, configure.bat, configure.in,
diff --git a/NEWS b/NEWS
index a23ce4f8..d3ae59a6 100644
--- a/NEWS
+++ b/NEWS
@@ -47,13 +47,12 @@ automatically, and continue to require a challenge for each resource.
 ** Added --max-redirect option, allowing the user to specify what should
 be the maximum number of HTTP redirects to follow.
 
-** Wget now saves HTTP downloads using file names specified by the
-`Content-Disposition' header.  This is a standard way of specifying the
-file name used by many web dynamically generated pages. For the time
-being, Content-Disposition is not used by default, to avoid the extra
-round-trips incurred (must specify "-e contentdisposition=yes"); this
-may change in a future version. NOTE: This functionality is currently
-considered "experimental", and may not be fully functional.
+** Wget now supports saving HTTP downloads using file names specified by
+the `Content-Disposition' header.  This is a standard way of specifying
+the file name used by many web dynamically generated pages. However, the
+current implementation is inefficient, and known to have bugs. It is
+EXPERIMENTAL only, and not enabled by default. Use --content-disposition
+to enable it.
 
 ** The GnuTLS library is now also experimentally supported for https
 downloads.  This is still work-in-progress.  OpenSSL is still used by
diff --git a/doc/ChangeLog b/doc/ChangeLog
index fa94d0c7..f2610c29 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-05  Micah Cowan  <micah@cowan.name>
+
+	* wget.texi <Wgetrc Commands>: Explicitly mention that
+	--content-disposition has known issues.
+
 2007-10-13  Micah Cowan  <micah@cowan.name>
 
 	* wget.texi <Mailing Lists>: Replaced mention of no-longer
diff --git a/doc/wget.texi b/doc/wget.texi
index 0220852c..9e9bd10c 100644
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -2554,8 +2554,8 @@ Set the connect timeout---the same as @samp{--connect-timeout}.
 @item content_disposition = on/off
 If this is set to on, experimental (not fully-functional) support for
 @samp{Content-Disposition} headers is enabled. This can currently result in
-extra round-trips to the server for a @samp{HEAD} request, which is why
-it is not currently enabled by default.
+extra round-trips to the server for a @samp{HEAD} request, and is known
+to suffer from a few bugs, which is why it is not currently enabled by default.
 
 This option is useful for some file-downloading CGI programs that use
 @samp{Content-Disposition} headers to describe what the name of a