diff --git a/fluent-package/Gemfile b/fluent-package/Gemfile
index 0418bbb0..e6335e8a 100644
--- a/fluent-package/Gemfile
+++ b/fluent-package/Gemfile
@@ -31,11 +31,16 @@ if ENV["INSTALL_GEM_FROM_LOCAL_REPO"]
   # into managed Gemfile.lock
   source FLUENTD_LOCAL_GEM_REPO do
     gem "fluentd"
+    # Until https://github.com/chef/win32-service/pull/85 is merged,
+    # this fix should be applied to fluent-package not to block starting fluentdwinsvc service on Windows.
+    # See https://github.com/fluent/fluent-package-builder/issues/618
+    gem 'win32-service', github: 'fluent-plugins-nursery/win32-service', branch: 'fix-slow-start-with-ruby3', platforms: [:mingw, :x64_mingw]
   end
 else
   # Lock to specific revision
   git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
   gem "fluentd", github: "fluent/fluentd", ref: FLUENTD_REVISION
+  gem 'win32-service', github: 'fluent-plugins-nursery/win32-service', branch: 'fix-slow-start-with-ruby3', platforms: [:mingw, :x64_mingw]
 end
 
 # plugin gems
@@ -81,7 +86,8 @@ gem "ffi-win32-extensions", "1.0.4", platforms: windows_platforms
 gem "nokogiri", "1.15.5", platforms: windows_platforms
 gem "win32-event", "0.6.3", platforms: windows_platforms
 gem "win32-ipc", "0.7.0", platforms: windows_platforms
-gem "win32-service", "2.3.2", platforms: windows_platforms
+# Use forked version of win32-service until https://github.com/chef/win32-service/pull/85 is merged.
+#gem "win32-service", "2.3.2", platforms: windows_platforms
 gem "winevt_c", "0.10.1", platforms: windows_platforms
 gem "win32-eventlog", "0.6.7", platforms: windows_platforms
 gem "fluent-plugin-parser-winevt_xml", "0.2.6", platforms: windows_platforms