diff --git a/rpm/dtb.spec.in.in b/rpm/dtb.spec.in.in
index e916c6e..279536a 100644
--- a/rpm/dtb.spec.in.in
+++ b/rpm/dtb.spec.in.in
@@ -94,6 +94,4 @@ for dts in $ALL_SUPPORTED_DTB; do
 done
 cd -
 
-$SUBPKG_POST
-$SUBPKG_FILES
 %changelog
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index b6835d2..4b41cce 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -296,6 +296,44 @@ Provides:       kernel-preempt_%_target_cpu = %version-%source_rel
 
 
 %source_timestamp
+
+%pre
+%if "%build_flavor" != "zfcpdump"
+%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name" \
+  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
+  --image "%image" --flavor "%build_flavor" --variant "%variant" \
+  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
+%endif
+%post
+%if "%build_flavor" != "zfcpdump"
+%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
+  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
+  --image "%image" --flavor "%build_flavor" --variant "%variant" \
+  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
+%endif
+%preun
+%if "%build_flavor" != "zfcpdump"
+%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
+  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
+  --image "%image" --flavor "%build_flavor" --variant "%variant" \
+  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
+%endif
+%postun
+%if "%build_flavor" != "zfcpdump"
+%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
+  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
+  --image "%image" --flavor "%build_flavor" --variant "%variant" \
+  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
+%endif
+%posttrans
+%if "%build_flavor" != "zfcpdump"
+%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
+  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
+  --image "%image" --flavor "%build_flavor" --variant "%variant" \
+  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
+%endif
+%files -f kernel-main.files
+
 %prep
 if ! [ -e %{S:0} ]; then
     echo "The %name-%version.nosrc.rpm package does not contain the" \
@@ -1109,43 +1147,6 @@ fi
 # /usr/src/linux-obj intentionally, to not accidentally break timestamps there
 %fdupes %buildroot%modules_dir
 
-%pre
-%if "%build_flavor" != "zfcpdump"
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-%endif
-%post
-%if "%build_flavor" != "zfcpdump"
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-%endif
-%preun
-%if "%build_flavor" != "zfcpdump"
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-%endif
-%postun
-%if "%build_flavor" != "zfcpdump"
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-%endif
-%posttrans
-%if "%build_flavor" != "zfcpdump"
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-%endif
-%files -f kernel-main.files
-
 %if "%CONFIG_MODULES" == "y" && %split_base
 %package base
 Summary:        @SUMMARY@ - base modules
diff --git a/rpm/kernel-docs.spec.in b/rpm/kernel-docs.spec.in
index 3749423..0ef9d84 100644
--- a/rpm/kernel-docs.spec.in
+++ b/rpm/kernel-docs.spec.in
@@ -98,6 +98,15 @@ A few basic documents from the current kernel sources.
 
 %source_timestamp
 
+%files
+%if 0%{?suse_version} && 0%{?suse_version} < 1500
+%doc COPYING
+%else
+%license COPYING
+%endif
+%doc CREDITS MAINTAINERS README
+%doc old_changelog.txt
+
 %if %build_pdf
 %package pdf
 Summary:        Kernel Documentation (PDF)
@@ -107,6 +116,11 @@ Group:          Documentation/Other
 These are PDF documents built from the current kernel sources.
 
 %source_timestamp
+
+%files pdf
+%dir %{_datadir}/doc/kernel
+%docdir %{_datadir}/doc/kernel/pdf
+%{_datadir}/doc/kernel/pdf
 %endif
 
 %if %build_html
@@ -118,6 +132,11 @@ Group:          Documentation/HTML
 These are HTML documents built from the current kernel sources.
 
 %source_timestamp
+
+%files html
+%dir %{_datadir}/doc/kernel
+%docdir %{_datadir}/doc/kernel/html
+%{_datadir}/doc/kernel/html
 %endif
 
 %prep
@@ -161,27 +180,4 @@ for i in pdf/Documentation/output/latex/*.pdf; do
 done
 %endif
 
-%files
-%if 0%{?suse_version} && 0%{?suse_version} < 1500
-%doc COPYING
-%else
-%license COPYING
-%endif
-%doc CREDITS MAINTAINERS README
-%doc old_changelog.txt
-
-%if %build_pdf
-%files pdf
-%dir %{_datadir}/doc/kernel
-%docdir %{_datadir}/doc/kernel/pdf
-%{_datadir}/doc/kernel/pdf
-%endif
-
-%if %build_html
-%files html
-%dir %{_datadir}/doc/kernel
-%docdir %{_datadir}/doc/kernel/html
-%{_datadir}/doc/kernel/html
-%endif
-
 %changelog
diff --git a/rpm/kernel-obs-build.spec.in b/rpm/kernel-obs-build.spec.in
index 7d935ff..e9ba426 100644
--- a/rpm/kernel-obs-build.spec.in
+++ b/rpm/kernel-obs-build.spec.in
@@ -74,6 +74,13 @@ inside of Open Build Service (OBS) VM builds. An initrd with some basic
 kernel modules is generated as well, but further kernel modules can be
 loaded during build when installing the kernel package.
 
+%files
+/.build.cmdline.*
+/.build.console.*
+/.build.hostarch.*
+/.build.initrd.*
+/.build.kernel.*
+
 %prep
 
 %build
@@ -174,11 +181,4 @@ fi
 #see obs-build commit e47399d738e51
 uname -m > %{buildroot}/.build.hostarch.kvm
 
-%files
-/.build.cmdline.*
-/.build.console.*
-/.build.hostarch.*
-/.build.initrd.*
-/.build.kernel.*
-
 %changelog
diff --git a/rpm/kernel-obs-qa.spec.in b/rpm/kernel-obs-qa.spec.in
index 613b4dc..3514ab3 100644
--- a/rpm/kernel-obs-qa.spec.in
+++ b/rpm/kernel-obs-qa.spec.in
@@ -47,6 +47,9 @@ ExclusiveArch:  do_not_build
 This package is using the kernel compiled within Open Build Service(OBS)
 projects and runs basic tests.
 
+%files
+/usr/share/%name
+
 %prep
 
 %build
@@ -70,7 +73,4 @@ fi
 mkdir -p %{buildroot}/usr/share/%name
 touch %{buildroot}/usr/share/%name/logfile
 
-%files
-/usr/share/%name
-
 %changelog
diff --git a/rpm/kernel-source.spec.in b/rpm/kernel-source.spec.in
index f350fd0..f05665f 100644
--- a/rpm/kernel-source.spec.in
+++ b/rpm/kernel-source.spec.in
@@ -167,6 +167,14 @@ Linux kernel sources with many fixes and improvements.
 
 
 %source_timestamp
+
+%post
+%relink_function
+
+relink linux-%kernelrelease%variant /usr/src/linux%variant
+
+%files -f nondevel.files
+
 %package -n kernel-devel%variant
 Summary:        Development files needed for building kernel modules
 Group:          Development/Sources
@@ -184,6 +192,15 @@ external kernel modules.
 
 %source_timestamp
 
+%post -n kernel-devel%variant
+%relink_function
+
+relink linux-%kernelrelease%variant /usr/src/linux%variant
+
+%files -n kernel-devel%variant -f devel.files
+%ghost /usr/src/linux%variant
+%doc /usr/share/doc/packages/*
+
 # Note: The kernel-macros package intentionally does not provide
 # multiversion(kernel) nor is its name decorated with the variant (-rt)
 %package -n kernel-macros
@@ -197,6 +214,14 @@ This package provides the rpm macros and templates for Kernel Module Packages
 
 %source_timestamp
 
+%if "%variant" == ""
+%files -n kernel-macros
+%{_rpmmacrodir}/macros.kernel-source
+/usr/lib/rpm/kernel-*-subpackage
+%dir /usr/lib/rpm/kernel
+/usr/lib/rpm/kernel/*
+%endif
+
 %package vanilla
 %obsolete_rebuilds %name-vanilla
 Summary:        Vanilla Linux kernel sources with minor build fixes
@@ -216,6 +241,11 @@ Vanilla Linux kernel sources with minor build fixes.
 
 %source_timestamp
 
+%if %do_vanilla
+%files vanilla
+/usr/src/linux-%kernelrelease-vanilla
+%endif
+
 %prep
 
 echo "Symbol(s): %symbols"
@@ -298,35 +328,4 @@ done
 ts="$(head -n1 %_sourcedir/source-timestamp)"
 find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts"
 
-%post
-%relink_function
-
-relink linux-%kernelrelease%variant /usr/src/linux%variant
-
-%post -n kernel-devel%variant
-%relink_function
-
-relink linux-%kernelrelease%variant /usr/src/linux%variant
-
-%files -f nondevel.files
-
-%files -n kernel-devel%variant -f devel.files
-%ghost /usr/src/linux%variant
-%doc /usr/share/doc/packages/*
-
-%if "%variant" == ""
-%files -n kernel-macros
-%{_rpmmacrodir}/macros.kernel-source
-/usr/lib/rpm/kernel-*-subpackage
-%dir /usr/lib/rpm/kernel
-/usr/lib/rpm/kernel/*
-%endif
-
-
-%if %do_vanilla
-
-%files vanilla
-/usr/src/linux-%kernelrelease-vanilla
-%endif
-
 %changelog
diff --git a/rpm/kernel-syms.spec.in b/rpm/kernel-syms.spec.in
index a4417b8..94b79aa 100644
--- a/rpm/kernel-syms.spec.in
+++ b/rpm/kernel-syms.spec.in
@@ -68,13 +68,14 @@ package dependencies.
 
 
 %source_timestamp
-%prep
-
-%install
-install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
 
 %files
 %dir %_docdir/%name
 %_docdir/%name/README.SUSE
 
+%prep
+
+%install
+install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
+
 %changelog
diff --git a/rpm/mkspec-dtb b/rpm/mkspec-dtb
index 897b65f..2bb997b 100755
--- a/rpm/mkspec-dtb
+++ b/rpm/mkspec-dtb
@@ -107,8 +107,6 @@ sub generate_spec($$$)
         unless ($exclusive_arch eq 'none');
 
     my $subpkg_desc = "";
-    my $subpkg_post = "";
-    my $subpkg_files = "";
     my $all_supported_dtb = "";
     my $DTS_folder = "arch/arm/boot/dts";
     if ($exclusive_arch =~ /aarch64/) {
@@ -150,7 +148,7 @@ sub generate_spec($$$)
             "%description -n $PKG_NAME\n" .
             "Device Tree files for $MACHINES.\n\n";
 
-        $subpkg_post .=
+        $subpkg_desc .=
             "%post -n $PKG_NAME\n" .
             "cd /boot\n" .
             "# If /boot/dtb is a symlink, remove it, so that we can replace it.\n" .
@@ -170,7 +168,7 @@ sub generate_spec($$$)
             $dtb_subdir .= "%dir %{dtbdir}$path\n";
         }
 
-        $subpkg_files .=
+        $subpkg_desc .=
             "%ifarch aarch64 riscv64\n" .
             "%files -n $PKG_NAME -f $PKG_NAME.list\n" .
             "%else\n" .
@@ -194,8 +192,6 @@ sub generate_spec($$$)
         $_ =~ s/\$DTS_folder/$DTS_folder/g;
         $_ =~ s/\$SUBPKG_DESC/$subpkg_desc/g;
         $_ =~ s/\$ALL_SUPPORTED_DTB/$all_supported_dtb/g;
-        $_ =~ s/\$SUBPKG_POST\n?/$subpkg_post/g;
-        $_ =~ s/\$SUBPKG_FILES\n?/$subpkg_files/g;
         print SPEC $_;
     }