diff --git a/Gemfile.lock b/Gemfile.lock
index b555c5d..760a747 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,23 +8,26 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    em-websocket (0.5.1)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
     event_emitter (0.2.5)
     eventmachine (1.0.3)
-    http_parser.rb (0.6.0)
     minitest (5.4.2)
     rake (10.3.2)
     websocket (1.2.1)
+    websocket-eventmachine-base (1.1.0)
+      eventmachine (~> 1.0)
+      websocket (~> 1.0)
+      websocket-native (~> 1.0)
+    websocket-eventmachine-server (1.0.1)
+      websocket-eventmachine-base (~> 1.0)
+    websocket-native (1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.3)
-  em-websocket
   eventmachine
   minitest
   rake
   websocket-client-simple!
+  websocket-eventmachine-server
diff --git a/sample/echo_server.rb b/sample/echo_server.rb
index f538a7f..fb49502 100644
--- a/sample/echo_server.rb
+++ b/sample/echo_server.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'eventmachine'
-require 'em-websocket'
+require 'websocket-eventmachine-server'
 
 PORT = (ARGV.shift || 8080).to_i
 
@@ -8,7 +8,8 @@
   @channel = EM::Channel.new
 
   puts "start websocket server - port:#{PORT}"
-  EM::WebSocket.start(:host => "0.0.0.0", :port => PORT) do |ws|
+
+  WebSocket::EventMachine::Server.start(:host => "0.0.0.0", :port => PORT) do |ws|
     ws.onopen do
       sid = @channel.subscribe do |mes|
         ws.send mes
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 0ab11c8..fce8703 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -3,6 +3,6 @@
 require 'minitest/autorun'
 require 'websocket-client-simple'
 require 'eventmachine'
-require 'em-websocket'
+require 'websocket-eventmachine-server'
 
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
diff --git a/test/test_websocket_client_simple.rb b/test/test_websocket_client_simple.rb
index d74b040..7d5401a 100644
--- a/test/test_websocket_client_simple.rb
+++ b/test/test_websocket_client_simple.rb
@@ -15,7 +15,7 @@ def test_echo
       @channel = EM::Channel.new
 
       ## echo server
-      EM::WebSocket.start(:host => "0.0.0.0", :port => port) do |ws|
+      WebSocket::EventMachine::Server.start(:host => "0.0.0.0", :port => port) do |ws|
         ws.onopen do
           sid = @channel.subscribe do |mes|
             ws.send mes
diff --git a/websocket-client-simple.gemspec b/websocket-client-simple.gemspec
index daacc07..73866d6 100644
--- a/websocket-client-simple.gemspec
+++ b/websocket-client-simple.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "em-websocket"
+  spec.add_development_dependency "websocket-eventmachine-server"
   spec.add_development_dependency "eventmachine"
 
   spec.add_dependency "websocket"