diff --git a/Gemfile b/Gemfile
index 0e04b50fa..71e9a15c9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,6 +16,14 @@
 #   limitations under the License.
 #
 
+# Gems only required on Windows, or with specific Windows issues
+if RUBY_PLATFORM.downcase.include?("mswin") || RUBY_PLATFORM.downcase.include?("mingw")
+  gem "win32console"
+  gem "eventmachine", "1.0.0.beta.4.1"
+else
+  gem "eventmachine", "0.12.10"
+end
+
 gem "thin"
 gem "ansi"
 gem "term-ansicolor", :require => "term/ansicolor"
@@ -28,11 +36,6 @@ gem "erubis"
 gem "dm-migrations"
 gem "msfrpc-client"
 
-# Gems only required one windows
-if RUBY_PLATFORM.downcase.include?("mswin")
-  gem "win32console"
-end
-
 if ENV['BEEF_TEST']
 # for running unit tests
   gem "test-unit"