diff --git a/tools/automate/automate-git.py b/tools/automate/automate-git.py
index 341acaa7e..1f7c097d3 100644
--- a/tools/automate/automate-git.py
+++ b/tools/automate/automate-git.py
@@ -1825,6 +1825,9 @@ def invalid_options_combination(a, b):
     if options.nodistribarchive:
       path += ' --no-archive'
 
+    if options.nodebugbuild:
+      path += ' --no-debug-build'
+
     # Override the subdirectory name of binary_distrib if the caller requested.
     if options.distribsubdir != '':
       path += ' --distrib-subdir=' + options.distribsubdir
diff --git a/tools/make_distrib.py b/tools/make_distrib.py
index a14427ba4..7b9b73d72 100644
--- a/tools/make_distrib.py
+++ b/tools/make_distrib.py
@@ -685,6 +685,12 @@ def print_error(msg):
     dest='noformat',
     default=False,
     help='don\'t format autogenerated C/C++ files')
+parser.add_option(
+    '--no-debug-build',
+    action='store_true',
+    dest='no_debug_build',
+    default=False,
+    help='don\'t do debug build')
 parser.add_option(
     '--ninja-build',
     action='store_true',
@@ -1136,8 +1142,12 @@ def print_error(msg):
     sys.stdout.write("ERROR: No docs generated.\n")
 
 if mode == 'tools':
-  transfer_tools_files(script_dir, (build_dir_debug, build_dir_release),
-                       output_dir)
+  if options.no_debug_build:
+    transfer_tools_files(script_dir, (build_dir_release,),
+                         output_dir)
+  else:
+    transfer_tools_files(script_dir, (build_dir_debug, build_dir_release),
+                         output_dir)
 elif platform == 'windows':
   libcef_dll = 'libcef.dll'
   # yapf: disable