diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes
index 3594105..59b9461 100644
--- a/qemu-testsuite.changes
+++ b/qemu-testsuite.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 22 14:44:51 UTC 2016 - afaerber@suse.de
+
+- Tidy SLOF patch boilerplate (michals)
+
 -------------------------------------------------------------------
 Mon Nov 21 17:26:36 UTC 2016 - afaerber@suse.de
 
diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec
index 659c885..d0593ec 100644
--- a/qemu-testsuite.spec
+++ b/qemu-testsuite.spec
@@ -173,7 +173,9 @@ Patch1100:      ipxe-stable-buildid.patch
 
 # sgabios
 Patch1200:      sgabios-stable-buildid.patch
+%endif
 
+%if %{build_slof_from_source}
 # SLOF
 # (currently no patches)
 %endif
@@ -823,15 +825,10 @@ popd
 pushd roms/ipxe
 %patch1100 -p1
 popd
-
 pushd roms/sgabios
 %patch1200 -p1
 popd
 
-pushd roms/SLOF
-# (currently no patches)
-popd
-
 # as a safeguard, delete the firmware files that we intend to build
 for i in %built_firmware_files
 do
@@ -840,6 +837,9 @@ done
 %endif
 
 %if %{build_slof_from_source}
+pushd roms/SLOF
+# (currently no patches)
+popd
 rm -f pc-bios/slof.bin
 %endif
 
diff --git a/qemu.changes b/qemu.changes
index 3594105..59b9461 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 22 14:44:51 UTC 2016 - afaerber@suse.de
+
+- Tidy SLOF patch boilerplate (michals)
+
 -------------------------------------------------------------------
 Mon Nov 21 17:26:36 UTC 2016 - afaerber@suse.de
 
diff --git a/qemu.spec b/qemu.spec
index e0ea57e..c3ef17c 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -173,7 +173,9 @@ Patch1100:      ipxe-stable-buildid.patch
 
 # sgabios
 Patch1200:      sgabios-stable-buildid.patch
+%endif
 
+%if %{build_slof_from_source}
 # SLOF
 # (currently no patches)
 %endif
@@ -823,15 +825,10 @@ popd
 pushd roms/ipxe
 %patch1100 -p1
 popd
-
 pushd roms/sgabios
 %patch1200 -p1
 popd
 
-pushd roms/SLOF
-# (currently no patches)
-popd
-
 # as a safeguard, delete the firmware files that we intend to build
 for i in %built_firmware_files
 do
@@ -840,6 +837,9 @@ done
 %endif
 
 %if %{build_slof_from_source}
+pushd roms/SLOF
+# (currently no patches)
+popd
 rm -f pc-bios/slof.bin
 %endif
 
diff --git a/qemu.spec.in b/qemu.spec.in
index 3223c85..3ffff8d 100644
--- a/qemu.spec.in
+++ b/qemu.spec.in
@@ -105,7 +105,9 @@ Patch1100:      ipxe-stable-buildid.patch
 
 # sgabios
 Patch1200:      sgabios-stable-buildid.patch
+%endif
 
+%if %{build_slof_from_source}
 # SLOF
 # (currently no patches)
 %endif
@@ -687,15 +689,10 @@ popd
 pushd roms/ipxe
 %patch1100 -p1
 popd
-
 pushd roms/sgabios
 %patch1200 -p1
 popd
 
-pushd roms/SLOF
-# (currently no patches)
-popd
-
 # as a safeguard, delete the firmware files that we intend to build
 for i in %built_firmware_files
 do
@@ -704,6 +701,9 @@ done
 %endif
 
 %if %{build_slof_from_source}
+pushd roms/SLOF
+# (currently no patches)
+popd
 rm -f pc-bios/slof.bin
 %endif