diff --git a/assemble/prepare/etc/make.conf b/assemble/prepare/etc/make.conf
index 5eb4f1b..de50830 100644
--- a/assemble/prepare/etc/make.conf
+++ b/assemble/prepare/etc/make.conf
@@ -1,8 +1,8 @@
-# Calculate
+# Calculate comment=#
 ACCEPT_LICENSE="*"
 #?pkg(app-portage/layman)!=#
 source /var/lib/layman/make.conf
 #pkg#
-MAKEOPTS="#-os_install_makeopts-#"
+MAKEOPTS="#-os_assemble_makeopts-#"
 EMERGE_DEFAULT_OPTS="--jobs=4"
 
diff --git a/assemble/prepare/etc/resolv.conf b/assemble/prepare/etc/resolv.conf
new file mode 100644
index 0000000..b4232af
--- /dev/null
+++ b/assemble/prepare/etc/resolv.conf
@@ -0,0 +1 @@
+# Calculate link=../../../etc/resolv.conf mirror
diff --git a/assemble/prepare/tmp/.calculate_directory b/assemble/prepare/tmp/.calculate_directory
new file mode 100644
index 0000000..0b37922
--- /dev/null
+++ b/assemble/prepare/tmp/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=/var/calculate/tmp
diff --git a/assemble/setup/.calculate_directory b/assemble/setup/.calculate_directory
new file mode 100644
index 0000000..4beb45c
--- /dev/null
+++ b/assemble/setup/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip cl_assemble_setup_action==up
diff --git a/assemble/setup/etc/etc-update.conf b/assemble/setup/etc/etc-update.conf
new file mode 100644
index 0000000..6bffe0f
--- /dev/null
+++ b/assemble/setup/etc/etc-update.conf
@@ -0,0 +1,4 @@
+# Calculate format=procmail
+# arguments used whenever mv is called
+mv_opts=""
+
diff --git a/assemble/setup/etc/make.conf b/assemble/setup/etc/make.conf
new file mode 100644
index 0000000..1561c23
--- /dev/null
+++ b/assemble/setup/etc/make.conf
@@ -0,0 +1,6 @@
+# Calculate comment=#
+ACCEPT_LICENSE="*"
+source /var/lib/layman/make.conf
+MAKEOPTS="#-os_assemble_makeopts-#"
+EMERGE_DEFAULT_OPTS="--jobs=4"
+