diff --git a/lib/rack/handler/thin.rb b/lib/rack/handler/thin.rb
index 0f374907..5c762d4e 100644
--- a/lib/rack/handler/thin.rb
+++ b/lib/rack/handler/thin.rb
@@ -1,6 +1,15 @@
 # frozen_string_literal: true
 
-require 'rack/handler'
+# Try the old rack/handler (Rack 1 & 2), fall back to rackup/handler (Rack 3)
+begin
+  require 'rack/handler'
+rescue LoadError
+  require 'rackup/handler'
+end
+
+# Load Thin and its Logging module before we subclass
+require 'thin'
+require 'thin/logging'
 require_relative '../../thin/rackup/handler'
 
 module Rack