diff -Naur ltib.orig/dist/lfs-5.1/kernel/kernel-common.tmpl ltib/dist/lfs-5.1/kernel/kernel-common.tmpl
--- ltib.orig/dist/lfs-5.1/kernel/kernel-common.tmpl	2009-07-06 03:52:02.000000000 -0400
+++ ltib/dist/lfs-5.1/kernel/kernel-common.tmpl	2013-03-28 11:09:35.000000000 -0400
@@ -295,31 +295,36 @@
 fi
 if [ -n "$PKG_KERNEL_WANT_HEADERS" ]
 then
-    mkdir -p $RPM_BUILD_ROOT/%{pfx}/usr/src/linux/include
-    for i in asm-${LINTARCH} asm-generic config linux math-emu media mtd net pcmcia rxrpc scsi sound video
-    do
-        if [ -d include/$i ]
-        then
-            cp -a include/$i $RPM_BUILD_ROOT/%{pfx}/usr/src/linux/include
-        fi
-    done
+    if [ -n "$PKG_KERNEL_WANT_HEADERS_INSTALL" ]
+    then
+        make ARCH=$LINTARCH HOSTCC="$BUILDCC" INSTALL_HDR_PATH=$RPM_BUILD_ROOT/%{pfx}/usr/src/linux headers_install
+    else
+        mkdir -p $RPM_BUILD_ROOT/%{pfx}/usr/src/linux/include
+        for i in asm-${LINTARCH} asm-generic config linux math-emu media mtd net pcmcia rxrpc scsi sound video
+        do
+            if [ -d include/$i ]
+            then
+                cp -a include/$i $RPM_BUILD_ROOT/%{pfx}/usr/src/linux/include
+            fi
+        done
 
-    for i in asm config linux
-    do
-        if [ -d $KBOUT/include/$i ]
-        then
-            cp -a $KBOUT/include/$i $RPM_BUILD_ROOT/%{pfx}/usr/src/linux/include
-        fi
-    done
+        for i in asm config linux
+        do
+            if [ -d $KBOUT/include/$i ]
+            then
+                cp -a $KBOUT/include/$i $RPM_BUILD_ROOT/%{pfx}/usr/src/linux/include
+            fi
+        done
 
-    if [ "${LINTARCH}" = "arm" ]
-    then
-        if [ -d "$KBOUT/include/asm/arch" ]
+        if [ "${LINTARCH}" = "arm" ]
         then
-            mkdir -p $RPM_BUILD_ROOT/%{pfx}/usr/src/linux/include/asm/arch
-            cp -a $KBOUT/include/asm/arch/* $RPM_BUILD_ROOT/%{pfx}/usr/src/linux/include/asm/arch
-        else
-            echo "Don't know how to copy asm headers for this kernel"
+            if [ -d "$KBOUT/include/asm/arch" ]
+            then
+                mkdir -p $RPM_BUILD_ROOT/%{pfx}/usr/src/linux/include/asm/arch
+                cp -a $KBOUT/include/asm/arch/* $RPM_BUILD_ROOT/%{pfx}/usr/src/linux/include/asm/arch
+            else
+                echo "Don't know how to copy asm headers for this kernel"
+            fi
         fi
     fi
 fi