diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/.calculate_directory
index db9eb7a43..720d52e47 100644
--- a/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/.calculate_directory
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/.calculate_directory
@@ -1 +1 @@
-# Calculate path=/usr/#-os_install_lib_path-#/#-os_install_python-#/site-packages/portage/sync/modules
+# Calculate append=skip
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/__init__.py b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/__init__.py
index 66367a719..64ac5fd20 100644
--- a/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/__init__.py
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/__init__.py
@@ -1,3 +1,10 @@
+# Calculate run=/bin/bash
+
+for dn in /usr/#-os_install_lib_path-#/python*/site-packages/portage/sync/modules
+do
+    [[ -d $dn ]] || continue
+    [[ -d $dn/calculate ]] || mkdir -p $dn/calculate
+    cat >$dn/calculate/__init__.py <<EOF
 # Copyright 2014-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
@@ -27,3 +34,5 @@ module_spec = {
 		}
 	}
 }
+EOF
+done
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/calculate.py b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/calculate.py
index d3152f681..d4617a174 100644
--- a/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/calculate.py
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/calculate.py
@@ -1,3 +1,10 @@
+# Calculate run=/bin/bash
+
+for dn in /usr/#-os_install_lib_path-#/python*/site-packages/portage/sync/modules
+do
+    [[ -d $dn ]] || continue
+    [[ -d $dn/calculate ]] || mkdir -p $dn/calculate
+    cat >$dn/calculate/calculate.py <<EOF
 # Copyright 2005-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
@@ -46,3 +53,5 @@ class CalculateSync(NewBase):
 			self.logger(self.xterm_titles, msg)
 			writemsg_level(msg + "\n", noiselevel=-1, level=logging.ERROR)
 		return (exitcode, False)
+EOF
+done
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/zz-contents b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/zz-contents
new file mode 100644
index 000000000..c691b9e24
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/zz-contents
@@ -0,0 +1,3 @@
+# Calculate format=contents
+sys-apps/portage /usr/#-os_install_lib_path-#/python*/site-packages/portage/sync/modules/calculate
+sys-apps/portage /usr/#-os_install_lib_path-#/python*/site-packages/portage/sync/modules/calculate/*
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191218 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191218.1
similarity index 100%
rename from profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191218
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191218.1
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191218.2 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191218.2
new file mode 100644
index 000000000..da1478fc0
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191218.2
@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/portage
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#