diff --git a/.gitignore b/.gitignore
index a1f4afb..3fcdfe1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 tests/output/*
+.*.swp
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..a3b0c9a
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in seryz.gemspec
+gemspec
diff --git a/gpx.gemspec b/gpx.gemspec
index d13c94b..d8f7f07 100644
--- a/gpx.gemspec
+++ b/gpx.gemspec
@@ -1,16 +1,22 @@
-require './lib/gpx/gpx' # load this just to get GPX::VERSION
-require 'rake'        # For FileList
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gpx/version'
+
 Gem::Specification.new do |s|
   s.name = 'gpx'
   s.version = GPX::VERSION
+  s.authors = ["Guillaume Dott", "Doug Fales"]
+  s.email = ["guillaume+github@dott.fr", "doug.fales@gmail.com"]
   s.summary = %q{A basic API for reading and writing GPX files.}
   s.description = %q{A basic API for reading and writing GPX files.}
-  s.files = FileList[ "lib/**/*", "bin/*", "tests/**/*", "[A-Z]*", "Rakefile", "doc/**/*" ]
-  s.require_path = 'lib'
+
+  s.files = `git ls-files`.split($/)
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ["lib"]
   s.has_rdoc = true
-  s.author = "Doug Fales"
-  s.email = "doug.fales@gmail.com"
+
   s.homepage = "http://dougfales.github.com/gpx/"
   s.rubyforge_project = "gpx"
-  s.add_dependency('hpricot')
+  s.add_dependency 'hpricot'
 end
diff --git a/lib/gpx/gpx.rb b/lib/gpx/gpx.rb
index 7fd5339..a46f96d 100644
--- a/lib/gpx/gpx.rb
+++ b/lib/gpx/gpx.rb
@@ -21,8 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 module GPX
-  VERSION = "0.7"
-
   # A common base class which provides a useful initializer method to many
   # class in the GPX library.
   class Base
diff --git a/lib/gpx/version.rb b/lib/gpx/version.rb
new file mode 100644
index 0000000..3f659e9
--- /dev/null
+++ b/lib/gpx/version.rb
@@ -0,0 +1,3 @@
+module GPX
+  VERSION = "0.7"
+end