diff --git a/debian/changelog b/debian/changelog
index 86d88273..ff0077d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (1.151) UNRELEASED; urgency=low
+
+  * enforce installation of only suitable header packages for the respective
+    subarch on armel instead of blindly installing all armel headers (LP: #600478)
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 24 Sep 2010 14:51:53 +0200
+
 livecd-rootfs (1.150) maverick; urgency=low
 
   * Set GDM's default session to une-efl on ubuntu-netbook armel+dove.
diff --git a/livecd.sh b/livecd.sh
index 26a9fa9f..a4120518 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -526,6 +526,11 @@ Pin-Priority: 900
     for i in `comm -3 livecd.${FSS}.manifest-headers livecd.${FSS}.manifest-headers-full`; do
         HEADERMETA="$HEADERMETA $i"
     done
+    case $TARGETARCH in
+        armel)
+            HEADERMETA=linux-headers-${SUBARCH}
+            ;;
+    esac
     rm -f livecd.${FSS}.manifest-headers livecd.${FSS}.manifest-headers-full
     chroot ${ROOT} apt-get -y --purge remove $HEADERPACKAGES </dev/null || true
     chroot ${ROOT} apt-get -y --purge install $HEADERMETA </dev/null || true