diff --git a/sys-kernel/linux-server/Manifest b/sys-kernel/linux-server/Manifest
index 8ff0aa0e4..485cc0b0e 100644
--- a/sys-kernel/linux-server/Manifest
+++ b/sys-kernel/linux-server/Manifest
@@ -3,4 +3,4 @@ AUX linux-server-2.6.31-amd64.config 100571 RMD160 385f369ebe2ef37e4aa542c96420f
 AUX linux-server-2.6.31-x86.config 100842 RMD160 7c7f5a1350f53763b95dce2e6645402ed780d1c0 SHA1 817f467e4346bb64d33cc96d6cee046b6a3d8628 SHA256 301b169751ea1bba4eba5a3801292776e7f674cc3627dd307470e11a4a33f373
 DIST 2.6.31-2.tar.bz2 268156 RMD160 6740fef6a150456c67fa0b51f6219edcd3b56253 SHA1 00671dbe2a72b735c2c0c84b30e353915d568233 SHA256 af977768a1aac5f55a84149a9d9bc72fe18b73fbee65b833b6c39109c27626c6
 DIST linux-2.6.31.tar.bz2 61494822 RMD160 c0d88e63740abf0d4f9d82557260a31643f5a01b SHA1 c6e0e6b473ba2b80d164e37cfabf294e783c03d9 SHA256 0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
-EBUILD linux-server-2.6.31.ebuild 5145 RMD160 81ee702c87f3177af1495ca4727239e25421185a SHA1 0b421384148da1931ace84935e27f7fb03b2750a SHA256 d57b395a195d7d576c9476032529476e8d3998e213cbed601f2646499fc5a284
+EBUILD linux-server-2.6.31.ebuild 5170 RMD160 5475971a4409fbf44a5bef36c1984ed46b67ba0e SHA1 6b7c5263bcd0774ef5a7d629899c895e57e353cd SHA256 997ae5c801be36795ddb0b5f2f5198d3d67234ab1d7a40979cf1e0f04b86b3db
diff --git a/sys-kernel/linux-server/linux-server-2.6.31.ebuild b/sys-kernel/linux-server/linux-server-2.6.31.ebuild
index 7ff1d25e7..f85ed6929 100644
--- a/sys-kernel/linux-server/linux-server-2.6.31.ebuild
+++ b/sys-kernel/linux-server/linux-server-2.6.31.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.sabayon.org"
 SRC_URI="${KERNEL_URI}
 	http://distfiles.sabayonlinux.org/${CATEGORY}/linux-sabayon-patches/${K_SABPATCHES_PKG}"
 DEPEND="${DEPEND}
-	app-arch/lzma-utils
+	|| ( app-arch/xz-utils app-arch/lzma-utils )
 	<sys-kernel/genkernel-3.4.11
 	splash? ( x11-themes/sabayon-artwork-core )"
 RDEPEND="grub? ( sys-boot/grub sys-boot/grub-handler )"