diff --git a/BUILD.gn b/BUILD.gn
index 649249dfd..f9e3caea7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -488,3 +488,14 @@ if (libyuv_include_tests) {
     deps = [ ":libyuv" ]
   }
 }
+
+if (!build_with_chromium) {
+  # Write debug logs to gn_logs.txt.
+  # This is also required for Siso builds.
+  import("//build/gn_logs.gni")
+  lines = [
+            "Generated during 'gn gen' by //BUILD.gn.",
+            "",
+          ] + build_gn_logs
+  write_file("$root_build_dir/gn_logs.txt", lines)
+}
diff --git a/DEPS b/DEPS
index 8c7146022..809dab0cb 100644
--- a/DEPS
+++ b/DEPS
@@ -12,6 +12,8 @@ vars = {
   'ninja_version': 'version:3@1.12.1.chromium.4',
   # reclient CIPD package version
   'reclient_version': 're_client_version:0.178.0.5ee9d3e8-gomaip',
+  # siso CIPD package version.
+  'siso_version': 'git_revision:d9393c2115244b6e4a797189055e4a2b6769a64d',
   # Fetch configuration files required for the 'use_remoteexec' gn arg
   'download_remoteexec_cfg': False,
   # RBE instance to use for running remote builds
@@ -348,6 +350,15 @@ deps = {
     ],
     'dep_type': 'cipd',
   },
+  'src/third_party/siso/cipd': {
+    'packages': [
+      {
+        'package': 'infra/build/siso/${{platform}}',
+        'version': Var('siso_version'),
+      }
+    ],
+    'dep_type': 'cipd',
+  },
   'src/third_party/mockito/src': {
     'url': Var('chromium_git') + '/external/mockito/mockito.git' + '@' + '7c3641bcef717ffa7d765f2c86b847d0aab1aac9',
     'condition': 'checkout_android',
@@ -1849,6 +1860,16 @@ hooks = [
                '--quiet',
                ],
   },
+  # Configure Siso for developer builds.
+  {
+    'name': 'configure_siso',
+    'pattern': '.',
+    'action': ['python3',
+               'src/build/config/siso/configure_siso.py',
+               '--rbe_instance',
+               Var('rbe_instance'),
+               ],
+  },
 ]
 
 recursedeps = [