diff --git a/Change.log b/Change.log
index ab3ded5..64acd10 100644
--- a/Change.log
+++ b/Change.log
@@ -1,4 +1,4 @@
-CHANGE  LOG
+CHANGE LOG
 
 1.2.2
 * Добавлена поддержка хранения программы в репозитории GIT.
@@ -8,6 +8,8 @@ CHANGE  LOG
 * Утилита scratch переименована в cl-builder по аналогии с названиями утилит Calculate 2.
 * Добавлена поддержка установки Calculate Linux 9.9.
 * Опция установки -S, --scratch переименована на -b, --build.
+* Переход сборки на gentoo-source ядро.
+* Возвращение пакета ifplugd для десктопов. Нужен для CLS.
 
 1.2.1
 * Скрипт bashrc перемещен в /usr/calculate/install.
diff --git a/install/builder/kernel/config?system=desktop&march=i686 b/install/builder/kernel/config?system=desktop&march=i686
index dd6235d..1b64489 100644
--- a/install/builder/kernel/config?system=desktop&march=i686
+++ b/install/builder/kernel/config?system=desktop&march=i686
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30.4-calculate
-# Thu Aug  6 15:43:56 2009
+# Linux kernel version: 2.6.30-gentoo-r6
+# Tue Sep  8 19:05:10 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -537,6 +537,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
 
 #
 # Core Netfilter Configuration
@@ -597,6 +598,7 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -651,14 +653,17 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
+CONFIG_STP=m
+CONFIG_BRIDGE=m
 # CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
+CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
@@ -2434,7 +2439,6 @@ CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
 CONFIG_THINKPAD_ACPI_DEBUG=y
 # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_BAY=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_INTEL_MENLOW=m
@@ -2548,9 +2552,6 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_ECRYPT_FS is not set
-CONFIG_UNION_FS=m
-CONFIG_UNION_FS_XATTR=y
-# CONFIG_UNION_FS_DEBUG is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
diff --git a/install/builder/kernel/config?system=desktop&march=x86_64 b/install/builder/kernel/config?system=desktop&march=x86_64
index b5a49e8..1e68a26 100644
--- a/install/builder/kernel/config?system=desktop&march=x86_64
+++ b/install/builder/kernel/config?system=desktop&march=x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30.4-calculate
-# Thu Aug  6 15:43:58 2009
+# Linux kernel version: 2.6.30-gentoo-r6
+# Tue Sep  8 18:29:30 2009
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -512,6 +512,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
 
 #
 # Core Netfilter Configuration
@@ -572,6 +573,7 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -626,14 +628,17 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
+CONFIG_STP=m
+CONFIG_BRIDGE=m
 # CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
+CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
@@ -2386,7 +2391,6 @@ CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
 CONFIG_THINKPAD_ACPI_DEBUG=y
 # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_BAY=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_INTEL_MENLOW=m
@@ -2500,9 +2504,6 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_ECRYPT_FS is not set
-CONFIG_UNION_FS=m
-CONFIG_UNION_FS_XATTR=y
-# CONFIG_UNION_FS_DEBUG is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
diff --git a/install/builder/packages/base/base b/install/builder/packages/base/base
index 2739b35..37a3fa7 100644
--- a/install/builder/packages/base/base
+++ b/install/builder/packages/base/base
@@ -28,6 +28,7 @@ sys-apps/usbutils
 sys-apps/v86d #поддержка uvesafb
 sys-boot/grub
 sys-boot/calcboot
+sys-fs/aufs2
 #sys-fs/calculate-squashfs #модуль squashfs+lzma
 sys-fs/squashfs-tools
 sys-fs/dmraid
diff --git a/install/builder/packages/base/base_net b/install/builder/packages/base/base_net
index c3aed2e..9848450 100644
--- a/install/builder/packages/base/base_net
+++ b/install/builder/packages/base/base_net
@@ -6,6 +6,7 @@ net-dialup/rp-pppoe
 net-firewall/iptables
 net-fs/nfs-utils
 net-fs/mount-cifs
+sys-apps/ifplugd #автоматическое поднятие сетевых карт при подключении кабеля
 
 #?calculate!=CLS&calculate!=CLSG#
 net-analyzer/macchanger
diff --git a/install/builder/packages/server?calculate=CDS/server_net b/install/builder/packages/server?calculate=CDS/server_net
index 1a89020..4d2d5e8 100644
--- a/install/builder/packages/server?calculate=CDS/server_net
+++ b/install/builder/packages/server?calculate=CDS/server_net
@@ -13,5 +13,4 @@ net-p2p/bittorrent #BitTorrent сервер
 net-p2p/btpd #BitTorrent клиент
 net-proxy/squid #Proxy сервер
 net-ftp/proftpd #FTP сервер
-sys-apps/ifplugd #автоматическое поднятие сетевых карт при подключении кабеля
 
diff --git a/install/builder/profile/0builder/etc/portage/package.keywords/default b/install/builder/profile/0builder/etc/portage/package.keywords/default
index 5aac5f3..7bf3c03 100644
--- a/install/builder/profile/0builder/etc/portage/package.keywords/default
+++ b/install/builder/profile/0builder/etc/portage/package.keywords/default
@@ -7,6 +7,7 @@ sys-apps/baselayout #-unmask-#
 sys-apps/sysvinit #-unmask-#
 sys-fs/cryptsetup #-unmask-#
 ~sys-fs/udev-141 #-unmask-#
+=sys-kernel/gentoo-sources-2.6.30-r6 #-unmask-#
 x11-base/xorg-x11 #-unmask-#
 x11-drivers/xf86-video-radeonhd #-unmask-#
 x11-drivers/xf86-video-ati #-unmask-#
diff --git a/install/builder/profile/0builder/etc/portage/package.use/default b/install/builder/profile/0builder/etc/portage/package.use/default
index cdaabf8..f9560be 100644
--- a/install/builder/profile/0builder/etc/portage/package.use/default
+++ b/install/builder/profile/0builder/etc/portage/package.use/default
@@ -2,4 +2,4 @@
 
 dev-util/git curl webdav
 media-gfx/splashutils fbcondecor
-
+sys-fs/aufs2 kernel-patch
diff --git a/install/calculate b/install/calculate
index 800ecb5..a7c236a 100755
--- a/install/calculate
+++ b/install/calculate
@@ -3960,10 +3960,10 @@ sub configure{
 		printmes(" ".gettext('done').".\n");
 	}
 
-	#chroot emerge sys-kernel/calculate-sources если система собирается не из CLS
+	#chroot emerge sys-kernel/gentoo-sources если система собирается не из CLS
 	if($data{stage} !~m/iso$/){
 		printmes("  ".gettext('Install the kernel')); printmes("...");
-		if(system "$data{emergerun1} sys-kernel/calculate-sources $data{emergerun2} &>/dev/null"){
+		if(system "$data{emergerun1} sys-kernel/gentoo-sources $data{emergerun2} &>/dev/null"){
 			printmes(" ".gettext('error')."!\n");
 			umountbuild(); return '';
 		}else{