diff --git a/data/calculate b/data/calculate
index 7339b32..52685ec 100644
--- a/data/calculate
+++ b/data/calculate
@@ -14,7 +14,7 @@
 #  limitations under the License.
 
 depend() {
-	need localmount root fsck modules
+	need localmount root fsck modules calculate-core
 	before keymaps consolefont dbus
 	use swap hostname
 }
@@ -44,8 +44,7 @@ install_pkg()
 variable_value()
 {
 	local varname=$1
-	cl-install -vv --filter $varname | 
-		sed -rn "s/^$varname\s+\[[rw]\]\s+(.*)$/\1/p"
+	cl-core --variable install.$varname
 }
 
 install_video_driver()
@@ -113,7 +112,7 @@ configure_users() {
 start() {
 	install_video_driver
 	LANG=C create_nonroot_user
-	LANG=C /usr/bin/cl-install --startup --live
+	LANG=C /usr/bin/cl-core --method configure_system --live
 	LANG=C configure_users
 
 	/usr/sbin/env-update
@@ -126,9 +125,9 @@ start() {
 
 stop() {
 	local roottype=`variable_value os_root_type`
-	if [[ $roottype == "hdd" ]] && rc-config list boot | grep -q calculate
+	if [[ $roottype == "hdd" ]] && rc-config list boot | grep -q calculate-install
 	then
-		rc-update del calculate boot
+		rc-update del calculate-install boot
 		local distdir="/usr/portage/distfiles"
 		[[ -d "${distdir}" ]] && [[ -n "`ls ${distdir}`" ]] && rm ${distdir}/*
 	fi
diff --git a/setup.py b/setup.py
index 2bd2b7f..3ff927a 100755
--- a/setup.py
+++ b/setup.py
@@ -31,11 +31,11 @@ data_files = []
 
 var_data_files = []
 
-#data_files += [('/etc/init.d', ['data/calculate']),
-#               ('/usr/bin',['data/xautologin']),
-#               ('/usr/share/calculate/doc', ['data/handbook-en.html',
-#                                             'data/handbook-ru.html']),
-#               ('/bin',['data/bashlogin'])]
+data_files += [('/etc/init.d', ['data/calculate']),
+               ('/usr/bin',['data/xautologin']),
+               ('/usr/share/calculate/doc', ['data/handbook-en.html',
+                                             'data/handbook-ru.html']),
+               ('/bin',['data/bashlogin'])]
 
 BUILD_MAN_PATH = "build/man"