diff --git a/python/mozboot/bin/bootstrap.py b/python/mozboot/bin/bootstrap.py
index c8352e0f9885..c4b64b74bd80 100755
--- a/python/mozboot/bin/bootstrap.py
+++ b/python/mozboot/bin/bootstrap.py
@@ -170,6 +170,9 @@ def main(args):
     parser.add_option('--debug', dest='debug', action='store_true',
                       help='Print extra runtime information useful for debugging and '
                       'bug reports.')
+    parser.add_option('--no-system-changes', dest='no_system_changes', action='store_true',
+                      help='Only executes actions that leave the system '
+                      'configuration alone.')
 
     options, leftover = parser.parse_args(args)
 
@@ -190,7 +193,7 @@ def main(args):
             return 1
 
         dasboot = cls(choice=options.application_choice, no_interactive=options.no_interactive,
-                      vcs=options.vcs)
+                      vcs=options.vcs, no_system_changes=options.no_system_changes)
         dasboot.bootstrap()
 
         return 0