diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..5cf0755
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,2 @@
+source "http://rubygems.org <http://rubygems.org/>"
+gemspec
diff --git a/amp.gemspec b/amp.gemspec
new file mode 100644
index 0000000..57b3b0c
--- /dev/null
+++ b/amp.gemspec
@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+
+#require "amp"
+
+Gem::Specification.new do |s|
+  s.name        = "amp"
+  s.authors     = ["Michael Edgar", "Ari Brown"]
+  s.email       = ["adgar@carboni.ca", "seydar@carboni.ca"]
+  s.version     = '0.5.3' #Amp::VERSION
+  s.homepage = "http://amp.carboni.ca/"
+  s.summary = "Version Control in Ruby. Mercurial Compatible. Big Ideas."
+  s.rubyforge_project = 'amp'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency %q<bundler>, ["~> 1.0.0"]
+  s.add_development_dependency %q<rtfm>, ["~> 0.5.1"]
+  s.add_development_dependency %q<yard>, [">= 0.4.0"]
+  s.add_development_dependency %q<minitest>, [">= 1.5.0"]
+
+  # self.spec_extras = {:extensions => ["ext/amp/mercurial_patch/extconf.rb",
+  #                                "ext/amp/priority_queue/extconf.rb",
+  #                                "ext/amp/support/extconf.rb",
+  #                                "ext/amp/bz2/extconf.rb"]}
+  # self.need_rdoc = false
+
+end
diff --git a/lib/amp/dependencies/zip/zip.rb b/lib/amp/dependencies/zip/zip.rb
index 7384c9a..6c850df 100755
--- a/lib/amp/dependencies/zip/zip.rb
+++ b/lib/amp/dependencies/zip/zip.rb
@@ -3,7 +3,7 @@
 require 'delegate'
 require 'singleton'
 require 'tempfile'
-require 'ftools'
+require 'fileutils'
 require 'stringio'
 require 'zlib'
 
diff --git a/lib/amp/support/support.rb b/lib/amp/support/support.rb
index 73b6910..f0f0486 100644
--- a/lib/amp/support/support.rb
+++ b/lib/amp/support/support.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 ##################################################################
 #                  Licensing Information                         #
 #                                                                #
@@ -14,7 +15,7 @@
 
 require 'digest'
 
-if RUBY_VERSION < "1.9" || RUBY_VERSION >= "1.9.2"
+if RUBY_VERSION < "1.9"
   require 'ftools'
   
   autoload :Etc,      'etc'