diff --git a/Gemfile b/Gemfile
index 122c549..2cb5d77 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,10 @@
 source "https://rubygems.org"
 
-gemspec
+if !!File::ALT_SEPARATOR
+  gemspec :name => 'rest-client.windows'
+else
+  gemspec
+end
 
 group :test do
   gem 'rake'
diff --git a/rest-client.gemspec.windows b/rest-client.windows.gemspec
similarity index 92%
rename from rest-client.gemspec.windows
rename to rest-client.windows.gemspec
index db52d7e..d593041 100644
--- a/rest-client.gemspec.windows
+++ b/rest-client.windows.gemspec
@@ -8,7 +8,7 @@
 
 s = eval(File.read(File.join(File.dirname(__FILE__), 'rest-client.gemspec')))
 
-platform = ENV['BUILD_PLATFORM']
+platform = ENV['BUILD_PLATFORM'] || RUBY_PLATFORM
 
 case platform
 when /(mingw32|mswin32)/