diff --git a/eclass/calculate.eclass b/eclass/calculate.eclass
index ad3029879..ea006a895 100644
--- a/eclass/calculate.eclass
+++ b/eclass/calculate.eclass
@@ -2,6 +2,59 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header:
 
+# @FUNCTION: rm_link_with_file
+# @USING: rm_link_with_file filename
+# @DESCRIPTION:
+# delete the file, and if it is symbolic then delete the file,
+# which point out a link
+rm_link_with_file() {
+	[[ -L $1 ]] && rm -f `readlink -f $1`
+	rm -f $1
+}
+
+# @FUNCTION: cp_link_with_file
+# @USING: cp_link_with_file filename suffix
+# @DESCRIPTION:
+# copy the file with the same name with the suffix, and if it is a symbolic
+# link, then also copy the target file with the addition of the suffix
+cp_link_with_file() {
+	if [[ -L $1 ]]
+	then
+		rm -f `readlink -f ${1}`$2
+		cp -aH ${1} `readlink -f ${1}`$2
+		ln -sf `readlink ${1}`${2} ${1}${2}
+	else
+		rm -f ${1}${2}
+		cp -aH ${1} ${1}${2}
+	fi
+}
+
+# @FUNCTION: make_old_file
+# @USAGE: make_old_file filename 
+# @DESCRIPTION:
+# wear out a file, copy the file, adding its name suffix ". old"
+# support symbolic link
+make_old_file() {
+	if [[ -e $1 ]]
+	then
+		rm_link_with_file $1.old
+		cp_link_with_file $1 .old
+	fi
+	rm_link_with_file $1
+}
+
+# @FUNCTION: update_file
+# @USAGE: wear_out_file filename link
+# @DESCRIPTION:
+# update a file, and make old file if need
+update_file() {
+	if [[ `readlink -f $2` != `readlink -f $1` ]]
+	then
+	    make_old_file $2
+		ln -sf `basename $1` $2
+	fi
+}
+
 # @FUNCTION: calculate_update_kernel
 # @USAGE: [kernelname] [kernelversion] [destination]
 # @DESCRIPTION:
@@ -11,19 +64,14 @@ calculate_update_kernel() {
 	kname=$1
 	kversion=$2
 	dir=$3
+	ls -la /boot
 
 	# update vmlinuz
-	[ -f ${dir}/vmlinuz ] && rm -f ${dir}/vmlinuz.old && 
-		mv ${dir}/vmlinuz	${dir}/vmlinuz.old
-	ln -sf "linux-${kname}-${kversion}-calculate" ${dir}/vmlinuz
+	update_file ${dir}/linux-${kname}-${kversion}-calculate ${dir}/vmlinuz
 	# update initrd
-	[ -f ${dir}/initrd ] && rm -f ${dir}/initrd.old &&
-		mv ${dir}/initrd ${dir}/initrd.old
-	ln -sf initramfs-${kname}-${kversion}-calculate ${dir}/initrd
+	update_file ${dir}/initramfs-${kname}-${kversion}-calculate ${dir}/initrd
 	# update System.map
-	[ -f ${dir}/System.map ] && rm -f ${dir}/System.map.old &&
-		mv ${dir}/System.map ${dir}/System.map.old
-	ln -sf System.map-${kname}-${kversion}-calculate ${dir}/System.map
+	update_file ${dir}/System.map-${kname}-${kversion}-calculate ${dir}/System.map
 	ebegin "Trying to optimize initramfs"
 	( which calculate &>/dev/null && calculate --initrd ) && eend 0 || eend 1
 }
diff --git a/sys-kernel/linux-desktop/Manifest b/sys-kernel/linux-desktop/Manifest
index ab987c753..ab83c1a49 100644
--- a/sys-kernel/linux-desktop/Manifest
+++ b/sys-kernel/linux-desktop/Manifest
@@ -1,4 +1,5 @@
-DIST linux-desktop-i686-2.6.31.7.tar.bz2 20694654 RMD160 9c975f2bb84cf2faa3c54556d9269a2210a2b899 SHA1 a45e32eade52c160c57cbc22b687210d2bfccd7a SHA256 9136eb788a624ec249726024ddfa062050b69cd9b3a1369d8a21ed93d82e5975
-EBUILD linux-desktop-2.6.31.7.ebuild 2518 RMD160 ce49110ce0932ba9bc2030245bb0fc16066431f6 SHA1 2bbf0244fb3eac861bcdcb2ee5b0947705471671 SHA256 47c8ffc9e79cf681015354022202ef6add9649a91e2c3892aa8c39637b322bc3
+DIST linux-desktop-i686-2.6.31.10.tar.bz2 22466319 RMD160 40940a5d9d178d90af8da04200349cf381c3f9b6 SHA1 d8f4db68c46af8432a13145129ff457a44024242 SHA256 b3a92c08d21558459883a97a600e89a291e62a8b5de70f3f18b88ccbdb436e49
+DIST linux-desktop-x86_64-2.6.31.10.tar.bz2 23187560 RMD160 a01eea0768d4e1ac3704703de1236c8bf236f360 SHA1 5a448674044192a1fdd28e0756ede48029ce0582 SHA256 5c528d3fd8c95b04cbfc1c3e97d8999f40655e7735926114b816516f33c7ccd5
+EBUILD linux-desktop-2.6.31.10.ebuild 2518 RMD160 e9c65820bf6f2bfe16930442653f92f53ebe429f SHA1 8fc9ccd0917b1798f54370aead86b3c4eacb823e SHA256 ee5f7f0835ce9bd19efaedba93a70b0758022c058d5b6753534ada39fbb945b3
 MISC ChangeLog 438 RMD160 14d3ecc39e03397ddec05b7eb76c901758f3aa32 SHA1 3f66f71ae244e30e69ed273fece6228c1140dc63 SHA256 f45966bf552f3c5bb69449167314bafb281b5fc6cf426d0aea1ab7851ebadc48
 MISC metadata.xml 301 RMD160 02bb86eab6405a3ef4c456cb74a1e75af6aa5908 SHA1 b175ee74e8df391d076f7eb5938f56a3b145ba14 SHA256 85b67abd7fbdbaf56de54b4d63580250b6f7ea0cfda624072a7601ee6d25ffd2
diff --git a/sys-kernel/linux-desktop/linux-desktop-2.6.31.7.ebuild b/sys-kernel/linux-desktop/linux-desktop-2.6.31.10.ebuild
similarity index 99%
rename from sys-kernel/linux-desktop/linux-desktop-2.6.31.7.ebuild
rename to sys-kernel/linux-desktop/linux-desktop-2.6.31.10.ebuild
index 563ae92a3..665ee67d7 100644
--- a/sys-kernel/linux-desktop/linux-desktop-2.6.31.7.ebuild
+++ b/sys-kernel/linux-desktop/linux-desktop-2.6.31.10.ebuild
@@ -19,7 +19,7 @@ KV_PATCH=31
 KV_TYPE=-calculate
 SLOT="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
 GENTOO_SOURCES_PV="${SLOT}"
-GENTOO_SOURCES_PR="r7"
+GENTOO_SOURCES_PR="r9"
 GENTOO_SOURCES_PVR="${GENTOO_SOURCES_PV}-${GENTOO_SOURCES_PR}"
 SRC_NAME=linux-${GENTOO_SOURCES_PV}-gentoo-${GENTOO_SOURCES_PR}
 SYSTEM="desktop"
diff --git a/sys-kernel/linux-server/Manifest b/sys-kernel/linux-server/Manifest
index 1f03f631c..aec1d7a88 100644
--- a/sys-kernel/linux-server/Manifest
+++ b/sys-kernel/linux-server/Manifest
@@ -1,4 +1,5 @@
-DIST linux-server-i686-2.6.31.7.tar.bz2 19745967 RMD160 859a42ff21742a5df2783dba4f67b4b5936db4d9 SHA1 7d890f4d003e0307cdeac7d244f3696ea56f344d SHA256 b5513bb8f6ad5fce504073158004986d2708528a5c13ae761ca15921ae909b6b
-EBUILD linux-server-2.6.31.7.ebuild 2517 RMD160 00c285e428209056d9bf499c5ee383b14767794b SHA1 741dd882e3a39c0dfd5a96667c67095255f9c106 SHA256 4ad4586afe32486cabc0e314acc706e148b58396152a8e1cf88ab58333a7b0de
+DIST linux-server-i686-2.6.31.10.tar.bz2 22432151 RMD160 3bd826796a27c77ea23ea6502f8b7c7dfbca149b SHA1 078b54dd75e8a3a05331606b971facaf913641cc SHA256 d5e167163371ddfac80a69deb4dafbe2e778f851627f835e071688ba5790afd3
+DIST linux-server-x86_64-2.6.31.10.tar.bz2 23082938 RMD160 f77c0aa758991bafca2a6158193520f80a3ac37e SHA1 c51629468dc5b6e152ecfcf938c3b9f5c82631f5 SHA256 d51213f3b70ca9dc52449b676f3bb681c6032348157df55e8d223879de37fc5c
+EBUILD linux-server-2.6.31.10.ebuild 2517 RMD160 8e871ad8e2f884bf2e22ce31255cfa723b1b9ba8 SHA1 717508d8d3dfd9d0fe2349b28b757911584620b0 SHA256 839c99672cce7edb6aace34be49c60b4d394c3d4920f9b29e63120ffe921739b
 MISC ChangeLog 434 RMD160 36ce8852efe13c558c364c0e2226d415b092d20a SHA1 553fc53f5a0a418a661ca31c03ffecfc87111bfb SHA256 d1c6409cd5ca84d48bc89449598ca4ea27e88edfc1373648f2ff09f0c87e5e0a
 MISC metadata.xml 288 RMD160 5fd5b532cfce86a2e9a2a8b6ed45d37b50e35cbc SHA1 2cce1a3a0269f00995b3021bb73e27ded1de11e7 SHA256 876cd412c7719fddeb9a0e9c39179fe240cfa198f9db5db3b599e23f644b2459
diff --git a/sys-kernel/linux-server/linux-server-2.6.31.7.ebuild b/sys-kernel/linux-server/linux-server-2.6.31.10.ebuild
similarity index 99%
rename from sys-kernel/linux-server/linux-server-2.6.31.7.ebuild
rename to sys-kernel/linux-server/linux-server-2.6.31.10.ebuild
index 630f5b26f..0bd67c0a5 100644
--- a/sys-kernel/linux-server/linux-server-2.6.31.7.ebuild
+++ b/sys-kernel/linux-server/linux-server-2.6.31.10.ebuild
@@ -19,7 +19,7 @@ KV_PATCH=31
 KV_TYPE=-calculate
 SLOT="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
 GENTOO_SOURCES_PV="${SLOT}"
-GENTOO_SOURCES_PR="r7"
+GENTOO_SOURCES_PR="r9"
 GENTOO_SOURCES_PVR="${GENTOO_SOURCES_PV}-${GENTOO_SOURCES_PR}"
 SRC_NAME=linux-${GENTOO_SOURCES_PV}-gentoo-${GENTOO_SOURCES_PR}
 SYSTEM="server"