4 files changed, 11 insertions, 15 deletions
diff --git a/Gemfile b/Gemfile
index 708421e..d080412 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,10 +3,8 @@ source 'https://rubygems.org'
 gemspec :name => "mixlib-shellout"
 
 group(:test) do
-
   gem "rspec_junit_formatter"
   gem 'rake'
-
 end
 
 group(:development) do
diff --git a/Rakefile b/Rakefile
index 533b341..754ba4d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,20 +1,19 @@
 require 'rspec/core/rake_task'
 require 'rubygems/package_task'
+require 'mixlib/shellout/version'
 
 Dir[File.expand_path("../*gemspec", __FILE__)].reverse.each do |gemspec_path|
   gemspec = eval(IO.read(gemspec_path))
   Gem::PackageTask.new(gemspec).define
 end
 
-require 'mixlib/shellout/version'
-
 desc "Run all specs in spec directory"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = FileList['spec/**/*_spec.rb']
 end
 
 desc "Build it and ship it"
-task :ship => [:clean, :gem] do
+task ship: [:clobber_package, :gem] do
   sh("git tag #{Mixlib::ShellOut::VERSION}")
   sh("git push opscode --tags")
   Dir[File.expand_path("../pkg/*.gem", __FILE__)].reverse.each do |built_gem|
@@ -22,4 +21,4 @@ task :ship => [:clean, :gem] do
   end
 end
 
-task :default => :spec
+task default: :spec
diff --git a/mixlib-shellout-windows.gemspec b/mixlib-shellout-windows.gemspec
new file mode 100644
index 0000000..20c8164
--- /dev/null
+++ b/mixlib-shellout-windows.gemspec
@@ -0,0 +1,8 @@
+gemspec = eval(File.read(File.expand_path("../mixlib-shellout.gemspec", __FILE__)))
+
+gemspec.platform = Gem::Platform.new(["universal", "mingw32"])
+
+gemspec.add_dependency "win32-process", "~> 0.7.5"
+gemspec.add_dependency "windows-pr", "~> 1.2.4"
+
+gemspec
diff --git a/mixlib-shellout-x86-mingw32.gemspec b/mixlib-shellout-x86-mingw32.gemspec
deleted file mode 100644
index 2997a35..0000000
--- a/mixlib-shellout-x86-mingw32.gemspec
+++ /dev/null
@@ -1,9 +0,0 @@
-# x86-mingw32 Gemspec #
-gemspec = eval(IO.read(File.expand_path("../mixlib-shellout.gemspec", __FILE__)))
-
-gemspec.platform = "x86-mingw32"
-
-gemspec.add_dependency "win32-process", "~> 0.7.1"
-gemspec.add_dependency "windows-pr", "~> 1.2.2"
-
-gemspec