--- lib/rubygems/defaults/operating_system.rb.orig	2008-09-18 18:02:38.000000000 -0700
+++ lib/rubygems/defaults/operating_system.rb	2008-09-18 17:58:29.000000000 -0700
@@ -20,9 +20,24 @@
 
   # Set the default gem installation directories and paths to the Debian
   # defaults by poking the correct values into the ENV hash.
-  ENV['GEM_HOME'] = File.join('','var','lib','gems',ConfigMap[:ruby_version])
-  # I don't want to see 'default_dir' ever.
-  ENV['GEM_PATH'] = user_dir
+
+  class << self
+    undef_method :default_dir
+    undef_method :default_path
+    undef_method :default_bindir
+  end
+
+  def self.default_dir
+    File.join('','var','lib','gems',ConfigMap[:ruby_version])
+  end
+
+  def self.default_path
+    [user_dir, default_dir]
+  end
+
+  def self.default_bindir
+    File.join('','var','lib','gems',ConfigMap[:ruby_version],'bin')
+  end
 
   # Always remove the executable when the gem is removed.
   # (No good reason for them to remain and they complicate the