diff --git a/ChangeLog b/ChangeLog
index b102a0712e..13367508ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec  2 23:18:12 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: wrote the warning about HTTP_PROXY environment
+	  variable.
+
 Tue Dec  2 21:31:42 2003  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* bin/testrb: new test runner.  [ruby-core:01845]
diff --git a/lib/net/http.rb b/lib/net/http.rb
index bf74172bf5..6ac43729ba 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -109,7 +109,9 @@ module Net # :nodoc:
   #       # always connect to your.proxy.addr:8080 using specified username and password
   #             :
   #     }
-  #     
+  #
+  # Note that net/http never rely on HTTP_PROXY environment variable.
+  # If you want to use proxy, set it explicitly.
   # 
   # === Following Redirection
   #