diff --git a/build-qemu b/build-qemu
index 8298999..8b814ba 100755
--- a/build-qemu
+++ b/build-qemu
@@ -8,6 +8,7 @@ from shell_helpers import LF
 class Main(common.BuildCliFunction):
     def __init__(self):
         super().__init__()
+        self._add_argument('--configure')
         self.add_argument(
             'extra_config_args',
             default=[],
@@ -31,18 +32,19 @@ class Main(common.BuildCliFunction):
             build_type_cmd = ['--enable-debug', LF]
         else:
             build_type_cmd = []
-        self.sh.run_cmd(
-            [
-                os.path.join(self.env['qemu_source_dir'], 'configure'), LF,
-                '--enable-trace-backends=simple', LF,
-                '--target-list={}'.format(target_list), LF,
-                '--enable-sdl', LF,
-            ] +
-            build_type_cmd +
-            self.sh.add_newlines(self.env['extra_config_args']),
-            extra_paths=[self.env['ccache_dir']],
-            cwd=build_dir
-        )
+        if self.env['configure']:
+            self.sh.run_cmd(
+                [
+                    os.path.join(self.env['qemu_source_dir'], 'configure'), LF,
+                    '--enable-trace-backends=simple', LF,
+                    '--target-list={}'.format(target_list), LF,
+                    '--enable-sdl', LF,
+                ] +
+                build_type_cmd +
+                self.sh.add_newlines(self.env['extra_config_args']),
+                extra_paths=[self.env['ccache_dir']],
+                cwd=build_dir
+            )
         self.sh.run_cmd(
             (
                 [
diff --git a/common.py b/common.py
index bfd41f1..47c7cfa 100644
--- a/common.py
+++ b/common.py
@@ -1588,6 +1588,12 @@ Pass the given compiler flags to all languages (C, C++, Fortran, etc.)
                 'default': False,
                 "help": '''\
 Force rebuild even if sources didn't change.
+''',
+            },
+            '--configure': {
+                'default': True,
+                "help": '''\
+Also run the configuration step during build.
 ''',
             },
             '--optimization-level': {