diff --git a/Gemfile b/Gemfile
index c3cb479..20acbbc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
+gem "base64"
 gem "cyberarm_engine"
 gem "sdl2-bindings"
 gem "digest-crc"
diff --git a/Gemfile.lock b/Gemfile.lock
index eaa2669..a418a13 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    base64 (0.2.0)
     concurrent-ruby (1.2.2)
     cyberarm_engine (0.24.0)
       excon (~> 0.88)
@@ -9,7 +10,7 @@ GEM
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     event_emitter (0.2.6)
-    excon (0.104.0)
+    excon (0.108.0)
     ffi (1.16.3)
     ffi-win32-extensions (1.0.4)
       ffi
@@ -39,6 +40,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  base64
   cyberarm_engine
   digest-crc
   i18n
@@ -51,4 +53,4 @@ DEPENDENCIES
   win32-security
 
 BUNDLED WITH
-   2.4.14
+   2.5.3
diff --git a/w3d_hub_linux_launcher.rb b/w3d_hub_linux_launcher.rb
index ba44f74..b448872 100644
--- a/w3d_hub_linux_launcher.rb
+++ b/w3d_hub_linux_launcher.rb
@@ -1,6 +1,12 @@
 # Hint to SDL that we're not a game and that the system may sleep
 ENV["SDL_VIDEO_ALLOW_SCREENSAVER"] = "1"
 
+BUNDLER_USED = ARGV.join.include?("--bundler")
+if BUNDLER_USED
+  require "bundler/setup"
+  Bundler.require
+end
+
 require "fileutils"
 require "digest"
 require "rexml"
@@ -53,13 +59,15 @@ module Kernel
   end
 end
 
-begin
-  require_relative "../cyberarm_engine/lib/cyberarm_engine"
-rescue LoadError => e
-  logger.warn(W3DHub::LOG_TAG) { "Failed to load local cyberarm_engine:" }
-  logger.warn(W3DHub::LOG_TAG) { e }
+unless BUNDLER_USED
+  begin
+    require_relative "../cyberarm_engine/lib/cyberarm_engine"
+  rescue LoadError => e
+    logger.warn(W3DHub::LOG_TAG) { "Failed to load local cyberarm_engine:" }
+    logger.warn(W3DHub::LOG_TAG) { e }
 
-  require "cyberarm_engine"
+    require "cyberarm_engine"
+  end
 end
 
 class W3DHub