diff --git a/Rakefile b/Rakefile
index 96141944..f47d7a22 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,53 +2,50 @@
 require 'rubygems'
 gem 'echoe', '>=2.7.5'
 require 'echoe'
-FORCE_PURE = ENV['FORCE_PURE'] || false
 
 e = Echoe.new("mongrel") do |p|
   p.summary = "A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps."
   p.author ="Zed A. Shaw"
   p.clean_pattern = ['ext/http11/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'lib/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'ext/http11/Makefile', 'pkg', 'lib/*.bundle', '*.gem', 'site/output', '.config', 'lib/http11.jar', 'ext/http11_java/classes', 'coverage']
+  p.url = "http://mongrel.rubyforge.org"
   p.rdoc_pattern = ['README', 'LICENSE', 'CHANGELOG', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
   p.ignore_pattern = /^(pkg|site|projects|doc|log)|CVS|\.log/
   p.ruby_version = '>=1.8.4'
   p.dependencies = ['gem_plugin >=0.2.3']  
   p.extension_pattern = nil
-  p.certificate_chain = ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem',
-    '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem']
+  
+  p.certificate_chain = case ENV['USER']
+    when 'eweaver' 
+      ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem',
+       '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem']
+    when 'luislavena'
+      ['~/gem_certificates/mongrel-public_cert.pem',
+        '~/gem_certificates/luislavena-mongrel-public_cert.pem']    
+  end
   
   p.need_tar_gz = false
   p.need_tgz = true
 
-  case RUBY_PLATFORM
-    when /mswin/
-      p.certificate_chain = [
-        '~/projects/gem_certificates/mongrel-public_cert.pem',
-        '~/projects/gem_certificates/luislavena-mongrel-public_cert.pem'
-      ]
-    when /java/
-    else
-      p.extension_pattern = ["ext/**/extconf.rb"]
-  end
-
-  unless FORCE_PURE
-    p.eval = proc do
-      case RUBY_PLATFORM
-      when /mswin/
-        self.files += ['lib/http11.so']
-        self.platform = Gem::Platform::CURRENT
-        add_dependency('cgi_multipart_eof_fix', '>= 2.4')
-      when /java/
-        self.files += ['lib/http11.jar']
-        self.platform = 'jruby'
-      else
-        add_dependency('daemons', '>= 1.0.3')
-        add_dependency('fastthread', '>= 1.0.1')
-        add_dependency('cgi_multipart_eof_fix', '>= 2.4')
-      end
-    end
-  else
+  if RUBY_PLATFORM !~ /mswin|java/
     p.extension_pattern = ["ext/**/extconf.rb"]
   end
+
+  p.eval = proc do
+    case RUBY_PLATFORM
+    when /mswin/
+      self.files += ['lib/http11.so']
+      self.platform = Gem::Platform::WIN32
+      add_dependency('cgi_multipart_eof_fix', '>= 2.4')
+    when /java/
+      self.files += ['lib/http11.jar']
+      self.platform = 'jruby' # XXX Is this right?
+    else
+      add_dependency('daemons', '>= 1.0.3')
+      add_dependency('fastthread', '>= 1.0.1')
+      add_dependency('cgi_multipart_eof_fix', '>= 2.4')
+    end
+  end
+
 end
 
 #### Ragel builder