diff --git a/.travis.yml b/.travis.yml
index ce7ce5a..3595f84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,10 @@ cache:
 install:
 - bundle install
 rvm:
-- 1.9.3
 - 2.0
 - 2.1
 - 2.2
+- 2.3.0
 notifications:
   email:
     recipients:
@@ -26,8 +26,8 @@ deploy:
   on:
     tags: true
     all_branches: true
-    rvm: 1.9.3
     rvm: 2.0
     rvm: 2.1
     rvm: 2.2
+    rvm: 2.3.0
     repo: sensu-plugins/sensu-plugins-network-checks
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0be92e..7b16c03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,16 +4,27 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+### Fixed
+- check-whois-domain-expiration-multi.rb: Handle whois errors better by retrying failed lookupsE
+- Use Timeout.timeout not deprecated Object#timeout
+
+### Added
+- check-whois-domain-expiration-multi.rb: Add timeout option
+- Support for Ruby 2.3.0
+
+### Removed
+- Support for Ruby 1.9.3
+
+### Changed
+- Update to Rubocop 0.40 and cleanup
 
 ## [0.2.4] - 2016-04-02
 ### Fixed
 - metrics-ping.rb: Fix error when a host can't be pinged. Convert to a proper metrics check.
-- check-whois-domain-expiration-multi.rb: Handle whois errors better by retrying failed lookups
 
 ### Added
 - basic check for netfilter conntrack
 - Option for newline character in write string for check-banner
-- check-whois-domain-expiration-multi.rb: Add timeout option
 
 ## [0.1.4] - 2016-01-22
 ### Added
diff --git a/Rakefile b/Rakefile
index 6781090..4a53797 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,13 +7,7 @@ require 'yard'
 require 'yard/rake/yardoc_task'
 
 desc 'Don\'t run Rubocop for unsupported versions'
-begin
-  args = if RUBY_VERSION >= '2.0.0'
-           [:spec, :make_bin_executable, :yard, :rubocop, :check_binstubs]
-         else
-           [:spec, :make_bin_executable, :yard]
-         end
-end
+args = [:spec, :make_bin_executable, :yard, :rubocop, :check_binstubs]
 
 YARD::Rake::YardocTask.new do |t|
   OTHER_PATHS = %w().freeze
diff --git a/sensu-plugins-network-checks.gemspec b/sensu-plugins-network-checks.gemspec
index a5f1a67..a23dcd1 100644
--- a/sensu-plugins-network-checks.gemspec
+++ b/sensu-plugins-network-checks.gemspec
@@ -3,11 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'date'
 
-if RUBY_VERSION < '2.0.0'
-  require 'sensu-plugins-network-checks'
-else
-  require_relative 'lib/sensu-plugins-network-checks'
-end
+require_relative 'lib/sensu-plugins-network-checks'
 
 Gem::Specification.new do |s|
   s.authors                = ['Sensu-Plugins and contributors']
@@ -20,7 +16,7 @@ Gem::Specification.new do |s|
   s.files                  = Dir.glob('{bin,lib}/**/*') + %w(LICENSE README.md CHANGELOG.md)
   s.homepage               = 'https://github.com/sensu-plugins/sensu-plugins-network-checks'
   s.license                = 'MIT'
-  s.metadata               = { 'maintainer'         => '@rmc3',
+  s.metadata               = { 'maintainer'         => 'sensu-plugin',
                                'development_status' => 'active',
                                'production_status'  => 'unstable - testing recommended',
                                'release_draft'      => 'false',
@@ -29,7 +25,7 @@ Gem::Specification.new do |s|
   s.platform               = Gem::Platform::RUBY
   s.post_install_message   = 'You can use the embedded Ruby by setting EMBEDDED_RUBY=true in /etc/default/sensu'
   s.require_paths          = ['lib']
-  s.required_ruby_version  = '>= 1.9.3'
+  s.required_ruby_version  = '>= 2.0.0'
   s.summary                = 'Sensu plugins for checking network hardware, connections, and data'
   s.test_files             = s.files.grep(%r{^(test|spec|features)/})
   s.version                = SensuPluginsNetworkChecks::Version::VER_STRING