diff --git a/Rakefile b/Rakefile
index e56a71ce..588a0300 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,44 +1,23 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "streamio-ffmpeg"
-    gem.summary = %Q{Simple wrapper around ffmpeg to get metadata from movies and do transcoding}
-    gem.description = %Q{Simple wrapper around ffmpeg to get metadata from movies and do transcoding}
-    gem.email = "duztdruid@gmail.com"
-    gem.homepage = "http://github.com/streamio/streamio-ffmpeg"
-    gem.authors = ["David Backeus"]
-    gem.add_development_dependency "rspec", "1.3.0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+$LOAD_PATH.unshift 'lib'
 
 require 'spec/rake/spectask'
+
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+desc "Push a new version to Rubygems"
+task :publish do
+  require 'streamio-ffmpeg/version'
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "streamio-ffmpeg #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  sh "gem build streamio-ffmpeg.gemspec"
+  sh "gem push streamio-ffmpeg-#{Magick::VERSION}.gem"
+  sh "git tag v#{Magick::VERSION}"
+  sh "git push origin v#{Magick::VERSION}"
+  sh "git push origin master"
+  sh "git clean -fd"
+  exec "rake pages"
 end
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 7486fdbc..00000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.7.2
diff --git a/lib/ffmpeg/version.rb b/lib/ffmpeg/version.rb
new file mode 100644
index 00000000..801370e1
--- /dev/null
+++ b/lib/ffmpeg/version.rb
@@ -0,0 +1,3 @@
+module FFMPEG
+  VERSION = "0.7.3"
+end
diff --git a/lib/streamio-ffmpeg.rb b/lib/streamio-ffmpeg.rb
index 592341fc..68fe1cd5 100644
--- a/lib/streamio-ffmpeg.rb
+++ b/lib/streamio-ffmpeg.rb
@@ -2,13 +2,12 @@
 
 require 'logger'
 
+require 'ffmpeg/version'
 require 'ffmpeg/movie'
 require 'ffmpeg/transcoder'
 require 'ffmpeg/encoding_options'
  
 module FFMPEG
-  VERSION = '0.5.0'
-  
   # FFMPEG logs information about its progress when it's transcoding.
   # Jack in your own logger through this method if you wish to.
   #
diff --git a/streamio-ffmpeg.gemspec b/streamio-ffmpeg.gemspec
index 133b67cb..438e084c 100644
--- a/streamio-ffmpeg.gemspec
+++ b/streamio-ffmpeg.gemspec
@@ -1,70 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
 
-Gem::Specification.new do |s|
-  s.name = %q{streamio-ffmpeg}
-  s.version = "0.7.2"
+require "ffmpeg/version"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["David Backeus"]
-  s.date = %q{2010-08-11}
-  s.description = %q{Simple wrapper around ffmpeg to get metadata from movies and do transcoding}
-  s.email = %q{duztdruid@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "CHANGELOG",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/ffmpeg/encoding_options.rb",
-     "lib/ffmpeg/movie.rb",
-     "lib/ffmpeg/transcoder.rb",
-     "lib/streamio-ffmpeg.rb",
-     "spec/ffmpeg/encoding_options_spec.rb",
-     "spec/ffmpeg/movie_spec.rb",
-     "spec/ffmpeg/transcoder_spec.rb",
-     "spec/fixtures/movies/awesome movie.mov",
-     "spec/fixtures/movies/awesome_widescreen.mov",
-     "spec/fixtures/movies/broken.mp4",
-     "spec/fixtures/movies/weird_aspect.small.mpg",
-     "spec/fixtures/sounds/napoleon.mp3",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/streamio-ffmpeg_spec.rb",
-     "streamio-ffmpeg.gemspec"
-  ]
-  s.homepage = %q{http://github.com/streamio/streamio-ffmpeg}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Simple wrapper around ffmpeg to get metadata from movies and do transcoding}
-  s.test_files = [
-    "spec/ffmpeg/encoding_options_spec.rb",
-     "spec/ffmpeg/movie_spec.rb",
-     "spec/ffmpeg/transcoder_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/streamio-ffmpeg_spec.rb"
-  ]
+Gem::Specification.new do |s|
+  s.name        = "streamio-ffmpeg"
+  s.version     = FFMPEG::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["David Backeus"]
+  s.email       = ["david@streamio.se"]
+  s.homepage    = "http://github.com/streamio/streamio-ffmpeg"
+  s.summary     = "Reads metadata and transcodes movies."
+  s.description = "Simple yet powerful wrapper around ffmpeg to get metadata from movies and do transcoding."
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.required_rubygems_version = ">= 1.3.6"
+  
+  s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
-    else
-      s.add_dependency(%q<rspec>, ["= 1.3.0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, ["= 1.3.0"])
-  end
+  s.files        = Dir.glob("lib/**/*") + %w(README.rdoc LICENSE CHANGELOG)
+  s.require_path = 'lib'
 end
-