diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 0a5db7a..0e8ef76 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -727,7 +727,6 @@ Patch300: jstack-pr1845.patch
 
 # Fixes StackOverflowError on ARM32 bit Zero. See RHBZ#1206656
 Patch403: rhbz1206656_fix_current_stack_pointer.patch
-
 Patch503: d318d83c4e74.patch
 # Patch for upstream JDK-8078666 (RHBZ#1208369)
 Patch505: 1208369_memory_leak_gcc5.patch
@@ -1016,19 +1015,15 @@ sh %{SOURCE12}
 
 # Extract systemtap tapsets
 %if %{with_systemtap}
-
 tar xzf %{SOURCE8}
-
 %patch300
-
-%patch503
-%patch505
-%patch506
-
 %if %{include_debug_build}
 cp -r tapset tapset%{debug_suffix}
 %endif
 
+%patch503
+%patch505
+%patch506
 
 for suffix in %{build_loop} ; do
   for file in "tapset"$suffix/*.in; do
@@ -1715,6 +1710,8 @@ end
    patch400 ppc_stack_overflow_fix.patch
    patch204 zero-interpreter-fix.patch
 - added Patch506 gif4.1.patch to allow build agaisnt giflib > 4.1
+- Patch503 d318d83c4e74.patch, patch505 1208369_memory_leak_gcc5.patch (and patch506 gif4.1.patch)
+   moved out of "if with_systemtap" block
 
 * Wed May 13 2015 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.45-38.b14
 - updated to 8u45-b14 with hope to fix rhbz#1123870