diff --git a/gem_rake_helper.rb b/gem_rake_helper.rb
index 7d00e3df..d4fe0f51 100644
--- a/gem_rake_helper.rb
+++ b/gem_rake_helper.rb
@@ -2,7 +2,9 @@ require 'rubygems' unless defined?(Gem)
 require 'rake'
 require 'cucumber/rake/task'
 require 'yard'
-require 'bundler/gem_tasks'
+
+require 'bundler'
+Bundler::GemHelper.install_tasks :name => GEM_NAME
 
 # Skip the releasing tag
 class Bundler::GemHelper
diff --git a/middleman-core/Rakefile b/middleman-core/Rakefile
index f8f412d3..227fe9b4 100644
--- a/middleman-core/Rakefile
+++ b/middleman-core/Rakefile
@@ -1,6 +1,8 @@
 # coding:utf-8
 RAKE_ROOT = __FILE__
 
+GEM_NAME = "middleman-core" + (ENV["WINDOWS"] ? "-x86-mingw32" : "")
+
 require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
 
diff --git a/middleman-more/Rakefile b/middleman-more/Rakefile
index f33347d2..e7ccf7ee 100644
--- a/middleman-more/Rakefile
+++ b/middleman-more/Rakefile
@@ -2,4 +2,5 @@
 RAKE_ROOT = __FILE__
 
 require 'rubygems'
+GEM_NAME = "middleman-more"
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
\ No newline at end of file
diff --git a/middleman/Rakefile b/middleman/Rakefile
index f33347d2..3eb8b88d 100644
--- a/middleman/Rakefile
+++ b/middleman/Rakefile
@@ -2,4 +2,5 @@
 RAKE_ROOT = __FILE__
 
 require 'rubygems'
+GEM_NAME = "middleman"
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
\ No newline at end of file