diff --git a/debian/patches/kbuild-fix-recordmcount-dependency.patch b/debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch
similarity index 100%
rename from debian/patches/kbuild-fix-recordmcount-dependency.patch
rename to debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch
diff --git a/debian/patches/lockdep-add-missing-macros.patch b/debian/patches/bugfix/all/lockdep-add-missing-macros.patch
similarity index 100%
rename from debian/patches/lockdep-add-missing-macros.patch
rename to debian/patches/bugfix/all/lockdep-add-missing-macros.patch
diff --git a/debian/patches/lockdep-fix-oot-build.patch b/debian/patches/bugfix/all/lockdep-fix-oot-build.patch
similarity index 100%
rename from debian/patches/lockdep-fix-oot-build.patch
rename to debian/patches/bugfix/all/lockdep-fix-oot-build.patch
diff --git a/debian/patches/lockdep-fix-soname.patch b/debian/patches/bugfix/all/lockdep-fix-soname.patch
similarity index 100%
rename from debian/patches/lockdep-fix-soname.patch
rename to debian/patches/bugfix/all/lockdep-fix-soname.patch
diff --git a/debian/patches/perf-fix-misleadingly-indented-assignment-whitespace.patch b/debian/patches/bugfix/all/perf-fix-misleadingly-indented-assignment-whitespace.patch
similarity index 100%
rename from debian/patches/perf-fix-misleadingly-indented-assignment-whitespace.patch
rename to debian/patches/bugfix/all/perf-fix-misleadingly-indented-assignment-whitespace.patch
diff --git a/debian/patches/power-cpupower-fix-manpages-NAME.patch b/debian/patches/bugfix/all/power-cpupower-fix-manpages-NAME.patch
similarity index 100%
rename from debian/patches/power-cpupower-fix-manpages-NAME.patch
rename to debian/patches/bugfix/all/power-cpupower-fix-manpages-NAME.patch
diff --git a/debian/patches/tools-build-remove-bpf-run-time-check-at-build-time.patch b/debian/patches/bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch
similarity index 100%
rename from debian/patches/tools-build-remove-bpf-run-time-check-at-build-time.patch
rename to debian/patches/bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch
diff --git a/debian/patches/tools-lib-lockdep-use-ldflags.patch b/debian/patches/bugfix/all/tools-lib-lockdep-use-ldflags.patch
similarity index 100%
rename from debian/patches/tools-lib-lockdep-use-ldflags.patch
rename to debian/patches/bugfix/all/tools-lib-lockdep-use-ldflags.patch
diff --git a/debian/patches/tools-lib-traceevent-fix-use-of-uninitialized-variables.patches b/debian/patches/bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch
similarity index 100%
rename from debian/patches/tools-lib-traceevent-fix-use-of-uninitialized-variables.patches
rename to debian/patches/bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch
diff --git a/debian/patches/tools-lib-traceevent-use-ldflags.patch b/debian/patches/bugfix/all/tools-lib-traceevent-use-ldflags.patch
similarity index 100%
rename from debian/patches/tools-lib-traceevent-use-ldflags.patch
rename to debian/patches/bugfix/all/tools-lib-traceevent-use-ldflags.patch
diff --git a/debian/patches/tools-perf-man-date.patch b/debian/patches/bugfix/all/tools-perf-man-date.patch
similarity index 100%
rename from debian/patches/tools-perf-man-date.patch
rename to debian/patches/bugfix/all/tools-perf-man-date.patch
diff --git a/debian/patches/tools-perf-remove-shebangs.patch b/debian/patches/bugfix/all/tools-perf-remove-shebangs.patch
similarity index 100%
rename from debian/patches/tools-perf-remove-shebangs.patch
rename to debian/patches/bugfix/all/tools-perf-remove-shebangs.patch
diff --git a/debian/patches/usbip-document-tcp-wrappers.patch b/debian/patches/bugfix/all/usbip-document-tcp-wrappers.patch
similarity index 100%
rename from debian/patches/usbip-document-tcp-wrappers.patch
rename to debian/patches/bugfix/all/usbip-document-tcp-wrappers.patch
diff --git a/debian/patches/usbip-include-uninstalled-linux-usbip-h.patch b/debian/patches/bugfix/all/usbip-include-uninstalled-linux-usbip-h.patch
similarity index 100%
rename from debian/patches/usbip-include-uninstalled-linux-usbip-h.patch
rename to debian/patches/bugfix/all/usbip-include-uninstalled-linux-usbip-h.patch
diff --git a/debian/patches/alpha-uapi-add-support-for-__sane_userspace_types__.patch b/debian/patches/bugfix/alpha/alpha-uapi-add-support-for-__sane_userspace_types__.patch
similarity index 100%
rename from debian/patches/alpha-uapi-add-support-for-__sane_userspace_types__.patch
rename to debian/patches/bugfix/alpha/alpha-uapi-add-support-for-__sane_userspace_types__.patch
diff --git a/debian/patches/perf-tools-fix-unused-variables-x86_-32-64-_regoffse.patch b/debian/patches/bugfix/x86/perf-tools-fix-unused-variables-x86_-32-64-_regoffse.patch
similarity index 100%
rename from debian/patches/perf-tools-fix-unused-variables-x86_-32-64-_regoffse.patch
rename to debian/patches/bugfix/x86/perf-tools-fix-unused-variables-x86_-32-64-_regoffse.patch
diff --git a/debian/patches/revert-perf-build-fix-libunwind-feature-detection-on.patch b/debian/patches/bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch
similarity index 100%
rename from debian/patches/revert-perf-build-fix-libunwind-feature-detection-on.patch
rename to debian/patches/bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch
diff --git a/debian/patches/revert-perf-tools-x86-build-perf-on-older-user-space.patch b/debian/patches/bugfix/x86/revert-perf-tools-x86-build-perf-on-older-user-space.patch
similarity index 100%
rename from debian/patches/revert-perf-tools-x86-build-perf-on-older-user-space.patch
rename to debian/patches/bugfix/x86/revert-perf-tools-x86-build-perf-on-older-user-space.patch
diff --git a/debian/patches/tools-hv-fix-fortify-format-warning.patch b/debian/patches/bugfix/x86/tools-hv-fix-fortify-format-warning.patch
similarity index 100%
rename from debian/patches/tools-hv-fix-fortify-format-warning.patch
rename to debian/patches/bugfix/x86/tools-hv-fix-fortify-format-warning.patch
diff --git a/debian/patches/modpost-symbol-prefix.patch b/debian/patches/debian/modpost-symbol-prefix.patch
similarity index 100%
rename from debian/patches/modpost-symbol-prefix.patch
rename to debian/patches/debian/modpost-symbol-prefix.patch
diff --git a/debian/patches/tools-perf-install.patch b/debian/patches/debian/tools-perf-install.patch
similarity index 100%
rename from debian/patches/tools-perf-install.patch
rename to debian/patches/debian/tools-perf-install.patch
diff --git a/debian/patches/tools-perf-version.patch b/debian/patches/debian/tools-perf-version.patch
similarity index 100%
rename from debian/patches/tools-perf-version.patch
rename to debian/patches/debian/tools-perf-version.patch
diff --git a/debian/patches/series b/debian/patches/series
index 60186695e..2fcfe3fb0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,9 @@ debian/mips-disable-werror.patch
 debian/arch-sh4-fix-uimage-build.patch
 debian/powerpcspe-omit-uimage.patch
 features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch
+debian/modpost-symbol-prefix.patch
+debian/tools-perf-version.patch
+debian/tools-perf-install.patch
 
 # Fixes/improvements to firmware loading
 features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
@@ -88,25 +91,23 @@ bugfix/x86/x86-mm-pat-fix-boot-crash-when-1gb-pages-are-not-supported.patch
 bugfix/all/netfilter-x_tables-check-for-size-overflow.patch
 bugfix/x86/vmxnet3-fix-lock-imbalance-in-vmxnet3_tq_xmit.patch
 
-modpost-symbol-prefix.patch
-tools-perf-version.patch
-tools-perf-install.patch
-usbip-document-tcp-wrappers.patch
-kbuild-fix-recordmcount-dependency.patch
-usbip-include-uninstalled-linux-usbip-h.patch
-tools-perf-man-date.patch
-lockdep-fix-oot-build.patch
-lockdep-fix-soname.patch
-tools-perf-remove-shebangs.patch
-tools-lib-traceevent-use-ldflags.patch
-tools-lib-lockdep-use-ldflags.patch
-tools-hv-fix-fortify-format-warning.patch
-revert-perf-build-fix-libunwind-feature-detection-on.patch
-alpha-uapi-add-support-for-__sane_userspace_types__.patch
-perf-fix-misleadingly-indented-assignment-whitespace.patch
-perf-tools-fix-unused-variables-x86_-32-64-_regoffse.patch
-revert-perf-tools-x86-build-perf-on-older-user-space.patch
-lockdep-add-missing-macros.patch
-tools-build-remove-bpf-run-time-check-at-build-time.patch
-power-cpupower-fix-manpages-NAME.patch
-tools-lib-traceevent-fix-use-of-uninitialized-variables.patches
+# Tools bug fixes
+bugfix/all/usbip-document-tcp-wrappers.patch
+bugfix/all/kbuild-fix-recordmcount-dependency.patch
+bugfix/all/usbip-include-uninstalled-linux-usbip-h.patch
+bugfix/all/tools-perf-man-date.patch
+bugfix/all/lockdep-fix-oot-build.patch
+bugfix/all/lockdep-fix-soname.patch
+bugfix/all/tools-perf-remove-shebangs.patch
+bugfix/all/tools-lib-traceevent-use-ldflags.patch
+bugfix/all/tools-lib-lockdep-use-ldflags.patch
+bugfix/x86/tools-hv-fix-fortify-format-warning.patch
+bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch
+bugfix/alpha/alpha-uapi-add-support-for-__sane_userspace_types__.patch
+bugfix/all/perf-fix-misleadingly-indented-assignment-whitespace.patch
+bugfix/x86/perf-tools-fix-unused-variables-x86_-32-64-_regoffse.patch
+bugfix/x86/revert-perf-tools-x86-build-perf-on-older-user-space.patch
+bugfix/all/lockdep-add-missing-macros.patch
+bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch
+bugfix/all/power-cpupower-fix-manpages-NAME.patch
+bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch