diff --git a/Gemfile b/Gemfile
index d6b60452..f2ed713b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'rack-cache',     '~> 1.2'
 gem 'gh',             github: 'rkh/gh'
 gem 'bunny'
 gem 'dalli'
-gem 'eventmachine', '~> 0.12.6'
+gem 'eventmachine'
 
 group :test do
   gem 'rspec',        '~> 2.11'
diff --git a/Gemfile.lock b/Gemfile.lock
index b9cebd0a..e3601b6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -125,7 +125,7 @@ GEM
     database_cleaner (0.8.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    eventmachine (0.12.10)
+    eventmachine (1.0.0)
     factory_girl (2.4.2)
       activesupport
     faraday (0.8.4)
@@ -238,7 +238,7 @@ DEPENDENCIES
   bunny
   dalli
   database_cleaner (~> 0.8.0)
-  eventmachine (~> 0.12.6)
+  eventmachine
   factory_girl (~> 2.4.0)
   foreman
   gh!