diff --git a/HLFS/master.sh b/HLFS/master.sh
index 2568bbb..0703553 100644
--- a/HLFS/master.sh
+++ b/HLFS/master.sh
@@ -294,6 +294,8 @@ chapter6_Makefiles() {       # sysroot or chroot build phase
       *chroot* )  continue ;;
         # Test if the stripping phase must be skipped
       *-stripping* )  [[ "$STRIP" = "n" ]] && continue ;;
+        # Skip linux-headers in iterative builds
+      *linux-headers*) [[ -n "$N" ]] && continue ;;
     esac
 
     # Grab the name of the target
diff --git a/LFS/master.sh b/LFS/master.sh
index 247f7db..01aa98c 100644
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -192,9 +192,11 @@ chapter6_Makefiles() {
 
     # We'll run the chroot commands differently than the others, so skip them in the
     # dependencies and target creation.
+    # Skip also linux-headers in iterative builds.
     case "${this_script}" in
       *chroot)      continue ;;
       *stripping*) [[ "${STRIP}" = "n" ]] && continue ;;
+      *linux-headers*) [[ -n "$N" ]] && continue ;;
     esac
 
     # Grab the name of the target.