diff --git a/Gemfile b/Gemfile
deleted file mode 100644
index c162b9b..0000000
--- a/Gemfile
+++ /dev/null
@@ -1,11 +0,0 @@
-source "http://rubygems.org"
-
-gem 'hoe'
-gem 'hoe-git'
-gem 'hoe-gemspec'
-
-group :development do
-  gem 'metaid'
-  gem 'rspec', '~> 2.0'
-  gem 'flexmock'
-end
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index ea1c5ce..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,32 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.2)
-    flexmock (0.8.11)
-    hoe (2.8.0)
-      rake (>= 0.8.7)
-    hoe-gemspec (1.0.0)
-      hoe (>= 2.2.0)
-    hoe-git (1.3.0)
-      hoe (>= 2.2.0)
-    metaid (1.0)
-    rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  flexmock
-  hoe
-  hoe-gemspec
-  hoe-git
-  metaid
-  rspec (~> 2.0)
diff --git a/Manifest.txt b/Manifest.txt
index 8ce0ded..71f081f 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -19,8 +19,8 @@ lib/net/ldap.rb
 lib/net/ldap/dataset.rb
 lib/net/ldap/entry.rb
 lib/net/ldap/filter.rb
+lib/net/ldap/password.rb
 lib/net/ldap/pdu.rb
-lib/net/ldap/psw.rb
 lib/net/ldif.rb
 lib/net/snmp.rb
 spec/integration/ssl_ber_spec.rb
@@ -32,11 +32,12 @@ spec/unit/ldap/entry_spec.rb
 spec/unit/ldap/filter_spec.rb
 spec/unit/ldap_spec.rb
 test/common.rb
-test/test_ber.rb
 test/test_entry.rb
 test/test_filter.rb
+test/test_ldap_connection.rb
 test/test_ldif.rb
 test/test_password.rb
+test/test_rename.rb
 test/test_snmp.rb
 test/testdata.ldif
 testserver/ldapserver.rb
diff --git a/Rakefile b/Rakefile
index 5707067..027f12b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,4 @@
 require "rubygems"
-# require 'hanna/rdoctask'
 require 'hoe'
 
 $LOAD_PATH.unshift('lib')
@@ -9,7 +8,6 @@ require 'net/ldap'
 PKG_NAME    = 'net-ldap'
 PKG_VERSION = Net::LDAP::VERSION
 PKG_DIST    = "#{PKG_NAME}-#{PKG_VERSION}"
-PKG_TAR     = "pkg/#{PKG_DIST}.tar.gz"
 MANIFEST    = File.read("Manifest.txt").split
 MINRUBY     = "1.8.7"
 
@@ -29,7 +27,7 @@ Hoe.spec PKG_NAME do
   self.remote_rdoc_dir = ''
   rsync_args << ' --exclude=statsvn/'
 
-  self.url = %W(http://net-ldap.rubyforge.org/ http://github.com/RoryO/ruby-net-ldap)
+  self.url = %W(http://net-ldap.rubyforge.org/ https://github.com/RoryO/ruby-net-ldap)
 
   self.summary = "Pure Ruby LDAP support library with most client features and some server features."
   self.changes = paragraphs_of(self.history_file, 0..1).join("\n\n")
@@ -37,68 +35,20 @@ Hoe.spec PKG_NAME do
 
   extra_rdoc_files << "Hacking.rdoc"
 
-  extra_dev_deps << [ "archive-tar-minitar", "~>0.5.1" ]
-  extra_dev_deps << [ "hanna", "~>0.1.2" ]
-  extra_dev_deps << [ "hoe-git", "~>1" ]
-  extra_dev_deps << [ "metaid", "~>1" ]
+  extra_dev_deps << [ "hoe-git", "~> 1" ]
+  extra_dev_deps << [ "hoe-gemspec", "~> 1" ]
+  extra_dev_deps << [ "metaid", "~> 1" ]
+  extra_dev_deps << [ "flexmock", "~> 0.9.0" ]
+  extra_dev_deps << [ "rspec", "~> 2.0" ]
   clean_globs << "coverage"
 
   spec_extras[:required_ruby_version] = ">= #{MINRUBY}"
   multiruby_skip << "1.8.6"
   multiruby_skip << "1_8_6"
 
-  # This is a lie because I will continue to use Archive::Tar::Minitar.
-  self.need_tar        = false
+  self.need_tar = true
 end
 
-desc "Build a Net-LDAP .tar.gz distribution."
-task :tar => [ PKG_TAR ]
-file PKG_TAR => [ :test ] do |t|
-  require 'archive/tar/minitar'
-  require 'zlib'
-  files = MANIFEST.map { |f|
-    fn = File.join(PKG_DIST, f)
-    tm = File.stat(f).mtime
-
-    if File.directory?(f)
-      { :name => fn, :mode => 0755, :dir => true, :mtime => tm }
-    else
-      mode = if f =~ %r{^bin}
-               0755
-             else
-               0644
-             end
-      data = File.read(f)
-      { :name => fn, :mode => mode, :data => data, :size => data.size,
-        :mtime => tm }
-    end
-  }
-
-  begin
-    unless File.directory?(File.dirname(t.name))
-      require 'fileutils'
-      File.mkdir_p File.dirname(t.name)
-    end
-    tf = File.open(t.name, 'wb')
-    gz = Zlib::GzipWriter.new(tf)
-    tw = Archive::Tar::Minitar::Writer.new(gz)
-
-    files.each do |entry|
-      if entry[:dir]
-        tw.mkdir(entry[:name], entry)
-      else
-        tw.add_file_simple(entry[:name], entry) { |os|
-          os.write(entry[:data])
-        }
-      end
-    end
-  ensure
-    tw.close if tw
-    gz.close if gz
-  end
-end
-task :package => [ PKG_TAR ]
-
 desc "Build the manifest file from the current set of files."
 task :build_manifest do |t|
   require 'find'
diff --git a/net-ldap.gemspec b/net-ldap.gemspec
index ad509d3..6e1c76e 100644
--- a/net-ldap.gemspec
+++ b/net-ldap.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{net-ldap}
-  s.version = "0.1.1.20110316141115"
+  s.version = "0.1.1.20110316193103"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Cianfrocca", "Emiel van de Laar", "Rory O'Connell", "Kaspar Schiess", "Austin Ziegler"]
@@ -10,37 +10,41 @@ Gem::Specification.new do |s|
   s.description = %q{Pure Ruby LDAP library.}
   s.email = ["blackhedd@rubyforge.org", "gemiel@gmail.com", "rory.ocon@gmail.com", "kaspar.schiess@absurd.li", "austin@rubyforge.org"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt", "Hacking.rdoc"]
-  s.files = ["COPYING", "Hacking.rdoc", "History.txt", "LICENSE", "Manifest.txt", "README.txt", "Rakefile", "lib/net-ldap.rb", "lib/net/ber.rb", "lib/net/ber/ber_parser.rb", "lib/net/ber/core_ext.rb", "lib/net/ber/core_ext/array.rb", "lib/net/ber/core_ext/bignum.rb", "lib/net/ber/core_ext/false_class.rb", "lib/net/ber/core_ext/fixnum.rb", "lib/net/ber/core_ext/string.rb", "lib/net/ber/core_ext/true_class.rb", "lib/net/ldap.rb", "lib/net/ldap/dataset.rb", "lib/net/ldap/entry.rb", "lib/net/ldap/filter.rb", "lib/net/ldap/pdu.rb", "lib/net/ldap/psw.rb", "lib/net/ldif.rb", "lib/net/snmp.rb", "spec/integration/ssl_ber_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/unit/ber/ber_spec.rb", "spec/unit/ber/core_ext/string_spec.rb", "spec/unit/ldap/entry_spec.rb", "spec/unit/ldap/filter_spec.rb", "spec/unit/ldap_spec.rb", "test/common.rb", "test/test_ber.rb", "test/test_entry.rb", "test/test_filter.rb", "test/test_ldif.rb", "test/test_password.rb", "test/test_snmp.rb", "test/testdata.ldif", "testserver/ldapserver.rb", "testserver/testdata.ldif", "test/test_rename.rb"]
+  s.files = ["COPYING", "Hacking.rdoc", "History.txt", "LICENSE", "Manifest.txt", "README.txt", "Rakefile", "lib/net-ldap.rb", "lib/net/ber.rb", "lib/net/ber/ber_parser.rb", "lib/net/ber/core_ext.rb", "lib/net/ber/core_ext/array.rb", "lib/net/ber/core_ext/bignum.rb", "lib/net/ber/core_ext/false_class.rb", "lib/net/ber/core_ext/fixnum.rb", "lib/net/ber/core_ext/string.rb", "lib/net/ber/core_ext/true_class.rb", "lib/net/ldap.rb", "lib/net/ldap/dataset.rb", "lib/net/ldap/entry.rb", "lib/net/ldap/filter.rb", "lib/net/ldap/password.rb", "lib/net/ldap/pdu.rb", "lib/net/ldif.rb", "lib/net/snmp.rb", "spec/integration/ssl_ber_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/unit/ber/ber_spec.rb", "spec/unit/ber/core_ext/string_spec.rb", "spec/unit/ldap/entry_spec.rb", "spec/unit/ldap/filter_spec.rb", "spec/unit/ldap_spec.rb", "test/common.rb", "test/test_entry.rb", "test/test_filter.rb", "test/test_ldap_connection.rb", "test/test_ldif.rb", "test/test_password.rb", "test/test_rename.rb", "test/test_snmp.rb", "test/testdata.ldif", "testserver/ldapserver.rb", "testserver/testdata.ldif"]
   s.homepage = %q{http://net-ldap.rubyforge.org/}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
   s.rubyforge_project = %q{net-ldap}
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Pure Ruby LDAP support library with most client features and some server features.}
-  s.test_files = ["test/test_entry.rb", "test/test_filter.rb", "test/test_ldif.rb", "test/test_password.rb", "test/test_rename.rb", "test/test_snmp.rb"]
+  s.test_files = ["test/test_entry.rb", "test/test_filter.rb", "test/test_ldap_connection.rb", "test/test_ldif.rb", "test/test_password.rb", "test/test_rename.rb", "test/test_snmp.rb"]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<archive-tar-minitar>, ["~> 0.5.1"])
-      s.add_development_dependency(%q<hanna>, ["~> 0.1.2"])
       s.add_development_dependency(%q<hoe-git>, ["~> 1"])
+      s.add_development_dependency(%q<hoe-gemspec>, ["~> 1"])
       s.add_development_dependency(%q<metaid>, ["~> 1"])
+      s.add_development_dependency(%q<flexmock>, ["~> 0.9.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0"])
       s.add_development_dependency(%q<hoe>, [">= 2.8.0"])
     else
-      s.add_dependency(%q<archive-tar-minitar>, ["~> 0.5.1"])
-      s.add_dependency(%q<hanna>, ["~> 0.1.2"])
       s.add_dependency(%q<hoe-git>, ["~> 1"])
+      s.add_dependency(%q<hoe-gemspec>, ["~> 1"])
       s.add_dependency(%q<metaid>, ["~> 1"])
+      s.add_dependency(%q<flexmock>, ["~> 0.9.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.0"])
       s.add_dependency(%q<hoe>, [">= 2.8.0"])
     end
   else
-    s.add_dependency(%q<archive-tar-minitar>, ["~> 0.5.1"])
-    s.add_dependency(%q<hanna>, ["~> 0.1.2"])
     s.add_dependency(%q<hoe-git>, ["~> 1"])
+    s.add_dependency(%q<hoe-gemspec>, ["~> 1"])
     s.add_dependency(%q<metaid>, ["~> 1"])
+    s.add_dependency(%q<flexmock>, ["~> 0.9.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.0"])
     s.add_dependency(%q<hoe>, [">= 2.8.0"])
   end
 end