diff --git a/merge/www-client/.calculate_directory b/merge/www-client/.calculate_directory
new file mode 100644
index 0000000..fe9987a
--- /dev/null
+++ b/merge/www-client/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip' %}
diff --git a/merge/www-client/chromium/.calculate_directory b/merge/www-client/chromium/.calculate_directory
new file mode 100644
index 0000000..5dd68ab
--- /dev/null
+++ b/merge/www-client/chromium/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path='/etc', package='www-client/chromium', ('CLDX' in install.os.linux.pkglist) %}
diff --git a/merge/www-client/chromium/password-store-basic b/merge/www-client/chromium/password-store-basic
new file mode 100644
index 0000000..c662dd7
--- /dev/null
+++ b/merge/www-client/chromium/password-store-basic
@@ -0,0 +1,5 @@
+{% calculate comment='#' %}
+# Basic password settings for chromium (gnome-keyring use lot of memory and cpu time).
+# This file is sourced by /bin/bash from the chromium launcher.
+
+CHROMIUM_FLAGS="${CHROMIUM_FLAGS} --password-store=basic"
diff --git a/merge/www-client/firefox/.calculate_directory b/merge/www-client/firefox/.calculate_directory
new file mode 100644
index 0000000..7d3e659
--- /dev/null
+++ b/merge/www-client/firefox/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip', package='www-client/firefox' %}
diff --git a/merge/www-client/firefox/config-prefs.js b/merge/www-client/firefox/config-prefs.js
new file mode 100644
index 0000000..e7d6785
--- /dev/null
+++ b/merge/www-client/firefox/config-prefs.js
@@ -0,0 +1,3 @@
+{% calculate path='/usr/lib/firefox/defaults/pref' %}
+pref("general.config.filename", "mozilla.cfg");
+pref("general.config.obscure_value", 0); // use this to disable the byte-shift
diff --git a/merge/www-client/firefox/mozilla.cfg b/merge/www-client/firefox/mozilla.cfg
new file mode 100644
index 0000000..8dd26ca
--- /dev/null
+++ b/merge/www-client/firefox/mozilla.cfg
@@ -0,0 +1,3 @@
+{% calculate path='/usr/lib/firefox' %}
+//
+unlockPref("toolkit.telemetry.enabled");