diff --git a/lib/twitter_ebooks/archive.rb b/lib/twitter_ebooks/archive.rb
index 87e06dc..566d9d8 100644
--- a/lib/twitter_ebooks/archive.rb
+++ b/lib/twitter_ebooks/archive.rb
@@ -31,14 +31,12 @@ module Ebooks
         end
       end
 
-      Twitter.configure do |config|
+      Twitter::REST::Client.new do |config|
         config.consumer_key = @config[:consumer_key]
         config.consumer_secret = @config[:consumer_secret]
         config.oauth_token = @config[:oauth_token]
         config.oauth_token_secret = @config[:oauth_token_secret]
       end
-
-      Twitter::Client.new
     end
 
     def initialize(username, path, client=nil)
diff --git a/lib/twitter_ebooks/bot.rb b/lib/twitter_ebooks/bot.rb
index aa8456e..fd2c29c 100755
--- a/lib/twitter_ebooks/bot.rb
+++ b/lib/twitter_ebooks/bot.rb
@@ -43,15 +43,13 @@ module Ebooks
         config.oauth_token_secret = @oauth_token_secret
       end
 
-      Twitter.configure do |config|
+      @twitter = Twitter::REST::Client.new do |config|
         config.consumer_key = @consumer_key
         config.consumer_secret = @consumer_secret
         config.oauth_token = @oauth_token
         config.oauth_token_secret = @oauth_token_secret
       end
 
-      @twitter = Twitter::Client.new
-
       needs_stream = [@on_follow, @on_message, @on_mention, @on_timeline].any? {|e| !e.nil?}
 
       @stream = TweetStream::Client.new if needs_stream
@@ -119,7 +117,7 @@ module Ebooks
         # - The tweet mentions list contains our username
         # - The tweet is not being retweeted by somebody else
         # - Or soft-retweeted by somebody else
-        if mentions.map(&:downcase).include?(@username.downcase) && !ev[:retweeted_status] && !ev[:text].start_with?('RT ')
+        if mentions.map(&:downcase).include?(@username.downcase) && !ev.retweeted_status? && !ev[:text].start_with?('RT ')
           log "Mention from @#{ev[:user][:screen_name]}: #{ev[:text]}"
           @on_mention.call(ev, meta) if @on_mention
         else
diff --git a/twitter_ebooks.gemspec b/twitter_ebooks.gemspec
index 8f3fe83..0fec762 100644
--- a/twitter_ebooks.gemspec
+++ b/twitter_ebooks.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'memory_profiler'
   gem.add_development_dependency 'pry-byebug'
 
-  gem.add_runtime_dependency 'twitter', '~> 4.0'
+  gem.add_runtime_dependency 'twitter', '~> 5.0'
   gem.add_runtime_dependency 'simple_oauth', '~> 0.2.0'
   gem.add_runtime_dependency 'tweetstream'
   gem.add_runtime_dependency 'rufus-scheduler'