diff --git a/build b/build
index 1a72568..a7bff54 100755
--- a/build
+++ b/build
@@ -307,7 +307,7 @@ so looping over all of them would waste time.
                 'gem5-buildroot',
             ]),
             'qemu-user': _Component(
-                self._build_file('build-qemu', user_mode=True),
+                self._build_file('build-qemu', mode='userland'),
                 apt_build_deps = {'qemu'},
                 apt_get_pkgs={'libsdl2-dev'},
                 submodules={'qemu'},
diff --git a/build-qemu b/build-qemu
index 06ee168..44ca910 100755
--- a/build-qemu
+++ b/build-qemu
@@ -8,11 +8,6 @@ from shell_helpers import LF
 class Main(common.BuildCliFunction):
     def __init__(self):
         super().__init__()
-        self.add_argument(
-            '--user-mode',
-            default=False,
-            help='Build QEMU user mode instead of system.',
-        )
         self.add_argument(
             'extra_config_args',
             default=[],
@@ -27,7 +22,7 @@ class Main(common.BuildCliFunction):
             verbose = ['V=1']
         else:
             verbose = []
-        if self.env['user_mode']:
+        if self.env['mode'] == 'userland':
             target_list = '{}-linux-user'.format(self.env['arch'])
         else:
             target_list = '{}-softmmu'.format(self.env['arch'])
@@ -38,7 +33,6 @@ class Main(common.BuildCliFunction):
                 '--enable-trace-backends=simple', LF,
                 '--target-list={}'.format(target_list), LF,
                 '--enable-sdl', LF,
-                '--with-sdlabi=2.0', LF,
             ] +
             self.sh.add_newlines(self.env['extra_config_args']),
             extra_paths=[self.env['ccache_dir']],
diff --git a/submodules/qemu b/submodules/qemu
index d0f9ab3..d8dae26 160000
--- a/submodules/qemu
+++ b/submodules/qemu
@@ -1 +1 @@
-Subproject commit d0f9ab350f315aa3643791b0587d28b38bf3b18c
+Subproject commit d8dae268c0a3e4e361002aca3b382fedd77f2567