diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f627fd4d0..3c11a55de 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-16  Corinna Vinschen  <corinna@vinschen.de>
+
+	* environ.cc (conv_envvars): Remove LD_LIBRARY_PATH entirely.
+	It doesn't belong here.
+
 2005-05-15  Corinna Vinschen  <corinna@vinschen.de>
 
 	* environ.cc (conv_envvars): Treat LD_LIBRARY_PATH as path list.
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index a280f52c7..774ce0be5 100644
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -61,10 +61,6 @@ static win_env conv_envvars[] =
      cygwin_posix_to_win32_path_list_buf_size, true},
     {NL ("HOME="), NULL, NULL, cygwin_conv_to_full_posix_path,
      cygwin_conv_to_full_win32_path, return_MAX_PATH, return_MAX_PATH, false},
-    {NL ("LD_LIBRARY_PATH="), NULL, NULL, cygwin_win32_to_posix_path_list,
-     cygwin_posix_to_win32_path_list,
-     cygwin_win32_to_posix_path_list_buf_size,
-     cygwin_posix_to_win32_path_list_buf_size, true},
     {NL ("TMPDIR="), NULL, NULL, cygwin_conv_to_full_posix_path,
      cygwin_conv_to_full_win32_path, return_MAX_PATH, return_MAX_PATH, false},
     {NL ("TMP="), NULL, NULL, cygwin_conv_to_full_posix_path,