diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0df3c7974..e6866ba19 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-04  Corinna Vinschen  <corinna@vinschen.de>
+
+	* syscalls.cc (internal_setlocale): Add comment.
+
 2009-10-02  Corinna Vinschen  <corinna@vinschen.de>
 
 	* dcrt0.cc (dll_crt0_1): Drop calls to setlocale/_setlocale_r.  Just
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index cd8909d89..c9767faf8 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -4186,6 +4186,8 @@ internal_setlocale ()
      reevaluate the CWD's posix path and store in the new charset.
      Same for the PATH environment variable. */
   /* FIXME: Other buffered paths might be affected as well. */
+  /* FIXME: It could be necessary to convert the entire environment,
+	    not just PATH. */
   tmp_pathbuf tp;
   wchar_t *w_path, *w_cwd;