diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 21bc7811..9a956392 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -125,8 +125,6 @@ libc6-i686
  * Kernel headers are included as third party modules are commonly
  * used on this architecture.
  */
-linux-image-686-pae
-linux-headers-686-pae
 #ifndef ARCH_i386_EXCLUDE_486_KERNEL
 linux-image-486
 linux-headers-486
@@ -139,6 +137,10 @@ linux-headers-586
 linux-image-686
 linux-headers-686
 #endif
+#ifndef ARCH_i386_EXCLUDE_686_PAE_KERNEL
+linux-image-686-pae
+linux-headers-686-pae
+#endif
 
 #endif