diff --git a/ChangeLog b/ChangeLog
index ffcf61ba44..b710091d25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 24 07:35:24 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http/backward.rb (class Net):  Restored Net::HTTPSession to
+	  fix backwards-compatibility with ancient Net::HTTP.  [Bug #6889]
+
 Thu Aug 23 20:58:55 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* common.mk: support `make id.h` without `rm .id.h.time` after
diff --git a/lib/net/http/backward.rb b/lib/net/http/backward.rb
index 7ffaac77d1..faf47b8489 100644
--- a/lib/net/http/backward.rb
+++ b/lib/net/http/backward.rb
@@ -4,7 +4,10 @@
 
 class Net::HTTP
   ProxyMod = ProxyDelta
-  HTTPSession = self
+end
+
+module Net
+  HTTPSession = Net::HTTP
 end
 
 module Net::NetPrivate