diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf
index 7cd1c31cf..f1c3abd3e 100644
--- a/package/base/linux/linux.conf
+++ b/package/base/linux/linux.conf
@@ -506,6 +506,9 @@ main_lx_headers() {
 	done
 	rm -vf $builddir/hdr_path/include/scsi/{sg,scsi,scsi_ioctl}.h
 	cp -av $builddir/hdr_path/include/* $root/usr/include/
+
+	# avoid shared files conflict with glibc
+	var_append flist''del '|' "usr/include/scsi"
 }
 
 autoextract=0
diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc
index 5f358eada..9d4f70c2f 100644
--- a/package/base/linux/linux.desc
+++ b/package/base/linux/linux.desc
@@ -50,8 +50,8 @@
 #endif
 
 #if xpkg == linux26.*
-[V] 2.6.21.1
-[D] 912049885 linux-2.6.21.1.tar.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/
+[V] 2.6.21.2
+[D] 3363684588 linux-2.6.21.2.tar.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/
 #endif
 
 [CD] <COPY> for x in $cachedir/linux2[46].cache; do cp $x $confdir/$pkg.cache; done