diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/tools b/profiles/templates/3.5/6_ac_update_sync/world/grp/tools
index c32829287..d29b35dc9 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/tools
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/tools
@@ -8,7 +8,7 @@ sys-apps/acl
 sys-apps/lshw
 sys-block/fio
 sys-fs/cryptsetup
-sys-kernel/calculate-sources:4.4.44
+sys-kernel/calculate-sources:4.9.8
 sys-power/powertop
 
 # magic dependence with sys-apps/hwinfo
diff --git a/sys-kernel/calculate-sources/Manifest b/sys-kernel/calculate-sources/Manifest
index 85f817f55..51ffdec31 100644
--- a/sys-kernel/calculate-sources/Manifest
+++ b/sys-kernel/calculate-sources/Manifest
@@ -2,6 +2,5 @@ DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc0
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
 DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
 DIST patch-4.1.38.xz 945376 SHA256 97eaedf1a4f5b931271035f640690757c0a3239d89f69c6dd7774d3371b589b6 SHA512 2d271e94fecc1a97c990de0e042cd20d5acdf6adfa71e71e162cf4886218b9481284aba4dd0201f777b146e309bfdf9d95062cfc878c08f613d8b50222010d2c WHIRLPOOL c947507c4e325bbdcdf2a49a2c58963bdf9b5876ebbfb8cce0a4b7c97fbb4fdefe904c52f59735efad24cd22becdf278e8d3bf898b2faa048618711161cd6f7b
-DIST patch-4.4.44.xz 923772 SHA256 43e67f75f28f5c81fc63d53498a33113dbda133fa7cb83be697825f6a8ee761e SHA512 f665eb040a717500aa6801243301a80ae4fbb4a256134d3ce73d6a84bd3240c64b544bb9c1ab241ff755af72ff9f60a576991b94506285fcd49934172c581b70 WHIRLPOOL 5cc726f80cc392eda43eff2ee952ef1650a48a933c29a7993f4feef1fa9261754d800ca7c680605312ac3049cdd7db70e97e8825c5e503cc9cb2cec3cec35d0c
 DIST patch-4.4.47.xz 940096 SHA256 21fd72caa322800b4668b4464d6ac4d8d66faa0056e08a5925d5911dab438c18 SHA512 f52936ab1dc91314a3cede35f9116332ce999b6442bdb575eda68dd2e57cd96517abc18b3bb05a2492e6cd13f849a09cece13463dfaa2d81ad390f8127b62813 WHIRLPOOL b4c0cf19ddc0fe12ab1349218716ad3be7ed42f542b91d39d41b78c544c874b07447f96acbe1bc72f6ca0798e11d2cc6813e3f04fdbbcfd2d12a8922e923f933
 DIST patch-4.9.8.xz 240648 SHA256 d53bb9fb309193cbbf88faa28f4cecfc312dbddaa4c2cbf089f2a7ecd56889c0 SHA512 98400f66cdb4536dfefc8e88a60d9c84dd60e999e1f8547dd25c1e1476099fa76c4f6a0b6b45f91ddc6003ec6233a3e1b6e44b8172c8e89b3e9aca7ffde7b15e WHIRLPOOL b527347ecc1970996d8adf588e1eacbc57a21bbd0c89d5bb66c73ad4e6f2c380fea41f4ba9b07bd986cea86fe0051c0d8333023f8a1399593b9d76090d10dff3
diff --git a/sys-kernel/calculate-sources/calculate-sources-4.4.44.ebuild b/sys-kernel/calculate-sources/calculate-sources-4.4.44.ebuild
deleted file mode 100644
index 63d12adbc..000000000
--- a/sys-kernel/calculate-sources/calculate-sources-4.4.44.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-ETYPE="sources"
-
-inherit calculate-kernel-7 eutils
-
-DESCRIPTION="Calculate Linux kernel image"
-KEYWORDS="amd64 x86"
-HOMEPAGE="http://www.calculate-linux.org"
-
-SRC_URI="${KERNEL_URI} ${ARCH_URI}"
-
-src_unpack() {
-	calculate-kernel-7_src_unpack
-}
-
-pkg_postinst() {
-	calculate-kernel-7_pkg_postinst
-}
diff --git a/sys-kernel/calculate-sources/calculate-sources-4.9.8.ebuild b/sys-kernel/calculate-sources/calculate-sources-4.9.8.ebuild
index bacb7052d..63d12adbc 100644
--- a/sys-kernel/calculate-sources/calculate-sources-4.9.8.ebuild
+++ b/sys-kernel/calculate-sources/calculate-sources-4.9.8.ebuild
@@ -8,7 +8,7 @@ ETYPE="sources"
 inherit calculate-kernel-7 eutils
 
 DESCRIPTION="Calculate Linux kernel image"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 HOMEPAGE="http://www.calculate-linux.org"
 
 SRC_URI="${KERNEL_URI} ${ARCH_URI}"