diff --git a/profiles/templates/3.1/2_ac_install_merge/sys-apps/portage/make.conf.base b/profiles/templates/3.1/2_ac_install_merge/sys-apps/portage/make.conf.base
deleted file mode 100644
index d67c24b5b..000000000
--- a/profiles/templates/3.1/2_ac_install_merge/sys-apps/portage/make.conf.base
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate protected path=/etc/portage/make.conf name=0-base
-
-# Connecting overlays layman. You should not change this setting, as this may
-# disrupt the package manager.
-source /var/lib/layman/make.conf
diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/portage/make.conf b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/portage/make.conf
index abc374af6..a9ec573ca 100644
--- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/portage/make.conf
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/portage/make.conf
@@ -1,4 +1,4 @@
-# Calculate path=/etc/portage/make.conf name=custom comment=# protected exists(/etc/portage/make.conf/custom)==||ac_install_disk==on||os_install_root_type==livecd
+# Calculate comment=# protected exists(/etc/make.conf)==||ac_install_disk==on||os_install_root_type==livecd
 
 #?os_install_locale_language!=ru&&os_install_locale_language!=bg#
 #-------------------
@@ -48,6 +48,20 @@ ACCEPT_LICENSE="*"
 #PORTAGE_BINHOST="http://mirror.cnet.kz/calculate/#-os_install_linux_shortname-#/grp/#-os_install_arch_machine-#"
 #os_install_linux_shortname#
 
+#?os_install_locale_language!=ru&&os_install_locale_language!=bg#
+# Connecting overlays layman. You should not change this setting, as this may
+# disrupt the package manager.
+#os_install_locale_language#
+#?os_install_locale_language==ru#
+# Подключение оверлеев layman. Не следует изменять эту настройку, так как это
+# может нарушить работу менеджера пакетов.
+#os_install_locale_language#
+#?os_install_locale_language==bg#
+# Свързване на допълнителни огледални сървъри към portage, промяната на тази
+# настройка може да наруши работата на пакетния мениджър.
+#os_install_locale_language#
+source /var/lib/layman/make.conf
+
 #?os_install_locale_language!=ru&&os_install_locale_language!=bg#
 #-----------------
 # Compiler Options