diff --git a/tools/make_distrib.py b/tools/make_distrib.py
index dd24122aa..af190b90e 100644
--- a/tools/make_distrib.py
+++ b/tools/make_distrib.py
@@ -699,6 +699,12 @@ parser.add_option(
     dest='nosandbox',
     default=False,
     help='don\'t create cef_sandbox files')
+parser.add_option(
+    '--no-format',
+    action='store_true',
+    dest='noformat',
+    default=False,
+    help='don\'t format autogenerated C/C++ files')
 parser.add_option(
     '--ninja-build',
     action='store_true',
@@ -937,18 +943,18 @@ if mode == 'standard' or mode == 'minimal':
   make_dir(libcef_dll_dir, options.quiet)
 
   # transfer common include files
-  transfer_gypi_files(cef_dir, cef_paths2['includes_common'], \
+  transfer_gypi_files(cef_dir, cef_paths2['includes_common'],
                       'include/', include_dir, options.quiet)
-  transfer_gypi_files(cef_dir, cef_paths2['includes_common_capi'], \
+  transfer_gypi_files(cef_dir, cef_paths2['includes_common_capi'],
                       'include/', include_dir, options.quiet)
-  transfer_gypi_files(cef_dir, cef_paths2['includes_capi'], \
+  transfer_gypi_files(cef_dir, cef_paths2['includes_capi'],
                       'include/', include_dir, options.quiet)
-  transfer_gypi_files(cef_dir, cef_paths2['includes_wrapper'], \
+  transfer_gypi_files(cef_dir, cef_paths2['includes_wrapper'],
                       'include/', include_dir, options.quiet)
-  transfer_gypi_files(cef_dir, cef_paths['autogen_cpp_includes'], \
-                      'include/', include_dir, options.quiet, format=True)
-  transfer_gypi_files(cef_dir, cef_paths['autogen_capi_includes'], \
-                      'include/', include_dir, options.quiet, format=True)
+  transfer_gypi_files(cef_dir, cef_paths['autogen_cpp_includes'],
+                      'include/', include_dir, options.quiet, format=not options.noformat)
+  transfer_gypi_files(cef_dir, cef_paths['autogen_capi_includes'],
+                      'include/', include_dir, options.quiet, format=not options.noformat)
 
   # Transfer generated include files.
   generated_includes = [
@@ -971,12 +977,12 @@ if mode == 'standard' or mode == 'minimal':
     copy_file(src_path, os.path.join(include_dir, include), options.quiet)
 
   # transfer common libcef_dll_wrapper files
-  transfer_gypi_files(cef_dir, cef_paths2['libcef_dll_wrapper_sources_base'], \
+  transfer_gypi_files(cef_dir, cef_paths2['libcef_dll_wrapper_sources_base'],
                       'libcef_dll/', libcef_dll_dir, options.quiet)
-  transfer_gypi_files(cef_dir, cef_paths2['libcef_dll_wrapper_sources_common'], \
+  transfer_gypi_files(cef_dir, cef_paths2['libcef_dll_wrapper_sources_common'],
                       'libcef_dll/', libcef_dll_dir, options.quiet)
-  transfer_gypi_files(cef_dir, cef_paths['autogen_client_side'], \
-                      'libcef_dll/', libcef_dll_dir, options.quiet, format=True)
+  transfer_gypi_files(cef_dir, cef_paths['autogen_client_side'],
+                      'libcef_dll/', libcef_dll_dir, options.quiet, format=not options.noformat)
 
   if mode == 'standard' or mode == 'minimal':
     # transfer additional files