diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec
index 374d352..794f95f 100644
--- a/qemu-testsuite.spec
+++ b/qemu-testsuite.spec
@@ -1401,12 +1401,14 @@ for f in %{x86_extra_firmware} \
 done
 %endif
 %find_lang %name
+install -d -m 0755 %{buildroot}%_datadir/%name/firmware
+install -d -m 0755 %{buildroot}%_libexecdir/supportconfig/plugins
+install -d -m 0755 %{buildroot}%_sysconfdir/%name/firmware
 install -D -m 0644 %{SOURCE4} %{buildroot}%_sysconfdir/%name/bridge.conf
 install -D -m 0755 %{SOURCE3} %{buildroot}%_datadir/%name/qemu-ifup
 install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules
 install -D -m 0755 scripts/analyze-migration.py  %{buildroot}%_bindir/analyze-migration.py
 install -D -m 0755 scripts/vmstate-static-checker.py  %{buildroot}%_bindir/vmstate-static-checker.py
-mkdir -p %{buildroot}%_libexecdir/supportconfig/plugins
 install -D -m 0755 %{SOURCE9} %{buildroot}%_libexecdir/supportconfig/plugins/%name
 %if 0%{?is_opensuse} == 0
 install -D -m 0644 %{SOURCE10} %{buildroot}%_docdir/qemu-arm/supported.txt
@@ -1586,6 +1588,7 @@ fi
 %dir %_datadir/%name/firmware
 %_datadir/%name/keymaps
 %_datadir/%name/trace-events-all
+%dir %_sysconfdir/%name
 %dir %_sysconfdir/%name/firmware
 %_datadir/%name/qemu-ifup
 %dir %_libexecdir/supportconfig
diff --git a/qemu.spec b/qemu.spec
index ad6ea06..2b17e52 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1401,12 +1401,14 @@ for f in %{x86_extra_firmware} \
 done
 %endif
 %find_lang %name
+install -d -m 0755 %{buildroot}%_datadir/%name/firmware
+install -d -m 0755 %{buildroot}%_libexecdir/supportconfig/plugins
+install -d -m 0755 %{buildroot}%_sysconfdir/%name/firmware
 install -D -m 0644 %{SOURCE4} %{buildroot}%_sysconfdir/%name/bridge.conf
 install -D -m 0755 %{SOURCE3} %{buildroot}%_datadir/%name/qemu-ifup
 install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules
 install -D -m 0755 scripts/analyze-migration.py  %{buildroot}%_bindir/analyze-migration.py
 install -D -m 0755 scripts/vmstate-static-checker.py  %{buildroot}%_bindir/vmstate-static-checker.py
-mkdir -p %{buildroot}%_libexecdir/supportconfig/plugins
 install -D -m 0755 %{SOURCE9} %{buildroot}%_libexecdir/supportconfig/plugins/%name
 %if 0%{?is_opensuse} == 0
 install -D -m 0644 %{SOURCE10} %{buildroot}%_docdir/qemu-arm/supported.txt
@@ -1586,6 +1588,7 @@ fi
 %dir %_datadir/%name/firmware
 %_datadir/%name/keymaps
 %_datadir/%name/trace-events-all
+%dir %_sysconfdir/%name
 %dir %_sysconfdir/%name/firmware
 %_datadir/%name/qemu-ifup
 %dir %_libexecdir/supportconfig
diff --git a/qemu.spec.in b/qemu.spec.in
index 1aaef0d..e641c75 100644
--- a/qemu.spec.in
+++ b/qemu.spec.in
@@ -1318,12 +1318,14 @@ for f in %{x86_extra_firmware} \
 done
 %endif
 %find_lang %name
+install -d -m 0755 %{buildroot}%_datadir/%name/firmware
+install -d -m 0755 %{buildroot}%_libexecdir/supportconfig/plugins
+install -d -m 0755 %{buildroot}%_sysconfdir/%name/firmware
 install -D -m 0644 %{SOURCE4} %{buildroot}%_sysconfdir/%name/bridge.conf
 install -D -m 0755 %{SOURCE3} %{buildroot}%_datadir/%name/qemu-ifup
 install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules
 install -D -m 0755 scripts/analyze-migration.py  %{buildroot}%_bindir/analyze-migration.py
 install -D -m 0755 scripts/vmstate-static-checker.py  %{buildroot}%_bindir/vmstate-static-checker.py
-mkdir -p %{buildroot}%_libexecdir/supportconfig/plugins
 install -D -m 0755 %{SOURCE9} %{buildroot}%_libexecdir/supportconfig/plugins/%name
 %if 0%{?is_opensuse} == 0
 install -D -m 0644 %{SOURCE10} %{buildroot}%_docdir/qemu-arm/supported.txt
@@ -1503,6 +1505,7 @@ fi
 %dir %_datadir/%name/firmware
 %_datadir/%name/keymaps
 %_datadir/%name/trace-events-all
+%dir %_sysconfdir/%name
 %dir %_sysconfdir/%name/firmware
 %_datadir/%name/qemu-ifup
 %dir %_libexecdir/supportconfig