diff --git a/source/downloads/code/migrator.rb b/source/downloads/code/migrator.rb
new file mode 100755
index 0000000..a0b861d
--- /dev/null
+++ b/source/downloads/code/migrator.rb
@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby -wKU
+
+raise "Git is required for the migration." if `which git`.empty?
+raise "You must run this script from the root of your Octopress blog directory" unless File.exist? File.join(Dir.pwd, '_config.yml') and \
+                                                                                       File.exist? File.join(Dir.pwd, 'Rakefile')
+
+require "fileutils"
+require "yaml"
+
+OCTO_GIT = "https://github.com/imathis/octopress.git"
+TMP_OCTO = "/tmp/octopress"
+
+OCTO_CONFIG_GIT = "https://github.com/octopress/sample-octopress-configuration"
+TMP_OCTO_CONFIG = "/tmp/sample-octopress-configuration"
+
+LOCAL_OCTOPRESS_INSTALLATION = Dir.pwd
+
+def curr_octo_dir(*subdirs)
+  File.join(LOCAL_OCTOPRESS_INSTALLATION, *subdirs)
+end
+
+def tmp_octo_dir(*subdirs)
+  File.join(TMP_OCTO, *subdirs)
+end
+
+begin
+
+  # Make local copy of imathis/octopress
+  FileUtils.rm_rf tmp_octo_dir
+  system "git clone #{GIT_TMP} #{tmp_octo_dir}"
+
+  # Make local copy of octopress/sample-octopress-configuration
+  FileUtils.rm_rf TMP_OCTO_CONFIG
+  system "git clone #{OCTO_CONFIG_GIT} #{TMP_OCTO_CONFIG}"
+
+  # copy new theme to current directory
+  FileUtils.rm_rf curr_octo_dir('.themes', 'classic')
+  FileUtils.cp_r tmp_octo_dir('.themes', 'classic'), curr_octo_dir('.themes')}
+  
+  # migrate configuration
+  local_config = YAML.load(File.read(curr_octo_dir("_config.yml")))
+  
+  FileUtils.mkdir_p curr_octo_dir('_config')
+  FileUtils.cp_r File.join(TMP_OCTO_CONFIG, 'defaults'), curr_octo_dir('_config'), :verbose => true, :remove_destination => true
+  
+  # build site configs
+  site_config = {}
+  %w(classic.yml disqus.yml gauges_analytics.yml github_repos_sidebar.yml google_analytics.yml
+    google_plus.yml jekyll.yml share_posts.yml tweets_sidebar.yml).each do |yaml_file|
+    this_yaml = YAML.load(File.read(File.join(curr_octo_dir('defaults', yaml_file))))
+    this_yaml.each_key do |key|
+      if local_config.has_key?(key) and this_yaml[key] != local_config[key]
+        site_config[key] = local_config[key]
+    end
+  end
+  
+  # write deploy configs
+  deploy_configs = {}
+  rakefile = File.read(curr_octo_dir('Rakefile'))
+  default_deploy = rakefile.match(/deploy_default\s*=\s*["']([\w-]*)["']/)[1]
+  defaults_deploy_file = curr_octo_dir('_config', 'defaults', 'deploy', (default_deploy == 'push' ? 'gh_pages.yml' : 'rsync.yml'))
+  deploy_configs = YAML.load(File.read(defaults_deploy_file))
+  
+  rakefile.match(/deploy_branch\s*=\s*["']([\w-]*)["'])[1]/)
+  # TODO extract deploy configs from Rakefile
+  
+  # write configs
+  File.open(curr_octo_dir('_config', 'site.yml'), 'w') do |f|
+    f.write(site_config.to_yaml)
+  end
+  File.open(curr_octo_dir('_config', 'deploy.yml'), 'w') do |f|
+    f.write(deploy_configs.to_yaml)
+  end
+  
+  # migrate Rakefile
+  FileUtils.mv curr_octo_dir("Rakefile"), curr_octo_dir("Rakefile-old")
+  FileUtils.cp tmp_octo_dir("Rakefile"), curr_octo_dir("Rakefile")
+
+  # migrate Gemfile
+  FileUtils.rm curr_octo_dir("Gemfile")
+  FileUtils.cp tmp_octo_dir("Gemfile"), curr_octo_dir("Gemfile")
+
+  # migrate updated plugins (but leave deprecated ones)
+  FileUtils.cp_r tmp_octo_dir("plugins"), curr_octo_dir("plugins")
+
+  # cleanup
+  FileUtils.rm_rf tmp_octo_dir
+  
+  puts "Your Octopress site has been successfully upgraded."
+  puts "Happy blogging!"
+  
+rescue => e
+  puts "An error occurred #{e}."
+  exit 1
+end
+