diff --git a/.gitignore b/.gitignore
index fd71451b7df..13233a48690 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@ lib/bundler/man
 
 # output from ci_reporter
 spec/reports
+
+# Netbeans
+nbproject
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb
index d074fd26cc0..06cb78c75fd 100644
--- a/lib/bundler/dependency.rb
+++ b/lib/bundler/dependency.rb
@@ -9,15 +9,17 @@ class Dependency < Gem::Dependency
     attr_reader :platforms
 
     PLATFORM_MAP = {
-      :ruby    => Gem::Platform::RUBY,
-      :ruby_18 => Gem::Platform::RUBY,
-      :ruby_19 => Gem::Platform::RUBY,
-      :mri     => Gem::Platform::RUBY,
-      :mri_18  => Gem::Platform::RUBY,
-      :mri_19  => Gem::Platform::RUBY,
-      :jruby   => Gem::Platform::JAVA,
-      :mswin   => Gem::Platform::MSWIN,
-      :mingw   => Gem::Platform::MINGW
+      :ruby     => Gem::Platform::RUBY,
+      :ruby_18  => Gem::Platform::RUBY,
+      :ruby_19  => Gem::Platform::RUBY,
+      :mri      => Gem::Platform::RUBY,
+      :mri_18   => Gem::Platform::RUBY,
+      :mri_19   => Gem::Platform::RUBY,
+      :jruby    => Gem::Platform::JAVA,
+      :mswin    => Gem::Platform::MSWIN,
+      :mingw    => Gem::Platform::MINGW,
+      :mingw_18 => Gem::Platform::MINGW,
+      :mingw_19 => Gem::Platform::MINGW
     }.freeze
 
     def initialize(name, version, options = {}, &blk)
@@ -115,5 +117,14 @@ def mswin?
     def mingw?
       Bundler::WINDOWS && Gem::Platform.local.os == "mingw32"
     end
+
+    def mingw_18?
+      mingw? && RUBY_VERSION < "1.9"
+    end
+
+    def mingw_19?
+      mingw? && RUBY_VERSION >= "1.9"
+    end
+
   end
 end
diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn
index 7553fc78151..b0d69153d03 100644
--- a/man/gemfile.5.ronn
+++ b/man/gemfile.5.ronn
@@ -124,6 +124,12 @@ There are a number of `Gemfile` platforms:
     JRuby
   * `mswin`:
     Windows
+  * `mingw`:
+    Windows 'mingw32' platform (aka RubyInstaller)
+  * `mingw_18`:
+    _mingw_ `AND` version 1.8
+  * `mingw_19`:
+    _mingw_ `AND` version 1.9
 
 As with groups, you can specify one or more platforms: