diff --git a/lib/google/api_client/environment.rb b/lib/google/api_client/environment.rb
index 488604866..7bb7966cf 100644
--- a/lib/google/api_client/environment.rb
+++ b/lib/google/api_client/environment.rb
@@ -1,7 +1,10 @@
 module Google
   class APIClient
     module ENV
-      OS_VERSION = if RUBY_PLATFORM =~ /win32/
+      OS_VERSION = if RUBY_PLATFORM =~ /mswin|win32|mingw|bccwin|cygwin/
+        # TODO(bobaman)
+        # Confirm that all of these Windows environments actually have access
+        # to the `ver` command.
         `ver`.sub(/\s*\[Version\s*/, '/').sub(']', '')
       elsif RUBY_PLATFORM =~ /darwin/i
         "Mac OS X/#{`sw_vers -productVersion`}"