diff --git a/etc/zebradb/lang_defs/sort-string-en.chr b/etc/zebradb/lang_defs/en/sort-string.chr
similarity index 100%
rename from etc/zebradb/lang_defs/sort-string-en.chr
rename to etc/zebradb/lang_defs/en/sort-string.chr
diff --git a/etc/zebradb/lang_defs/sort-string-fr.chr b/etc/zebradb/lang_defs/fr/sort-string.chr
similarity index 100%
rename from etc/zebradb/lang_defs/sort-string-fr.chr
rename to etc/zebradb/lang_defs/fr/sort-string.chr
diff --git a/etc/zebradb/marc_defs/authorities-marc21.abs b/etc/zebradb/marc_defs/marc21/authorities.abs
similarity index 100%
rename from etc/zebradb/marc_defs/authorities-marc21.abs
rename to etc/zebradb/marc_defs/marc21/authorities.abs
diff --git a/etc/zebradb/marc_defs/biblios-marc21.abs b/etc/zebradb/marc_defs/marc21/biblios.abs
similarity index 100%
rename from etc/zebradb/marc_defs/biblios-marc21.abs
rename to etc/zebradb/marc_defs/marc21/biblios.abs
diff --git a/etc/zebradb/marc_defs/authorities-unimarc.abs b/etc/zebradb/marc_defs/unimarc/authorities.abs
similarity index 100%
rename from etc/zebradb/marc_defs/authorities-unimarc.abs
rename to etc/zebradb/marc_defs/unimarc/authorities.abs
diff --git a/etc/zebradb/marc_defs/biblios-unimarc.abs b/etc/zebradb/marc_defs/unimarc/biblios.abs
similarity index 100%
rename from etc/zebradb/marc_defs/biblios-unimarc.abs
rename to etc/zebradb/marc_defs/unimarc/biblios.abs
diff --git a/etc/zebradb/zebra-authorities.cfg b/etc/zebradb/zebra-authorities.cfg
index 745ef66b96..1d41a2c3bf 100644
--- a/etc/zebradb/zebra-authorities.cfg
+++ b/etc/zebradb/zebra-authorities.cfg
@@ -4,7 +4,7 @@
 # $Id: zebra.cfg,v 1.1.2.2 2006/05/09 12:03:16 rangi Exp $
 #
 # Where are the config files located?
-profilePath:__ZEBRA_CONF_DIR__/authorities/etc:__ZEBRA_CONF_DIR__/etc
+profilePath:__ZEBRA_CONF_DIR__/authorities/etc:__ZEBRA_CONF_DIR__/etc:__ZEBRA_CONF_DIR__/marc_defs/__ZEBRA_MARC_FORMAT__:__ZEBRA_CONF_DIR__/lang_defs/__ZEBRA_LANGUAGE__
 
 encoding: UTF-8
 # modulePath - where to look for loadable zebra modules
diff --git a/etc/zebradb/zebra-biblios.cfg b/etc/zebradb/zebra-biblios.cfg
index b7910670e4..c2e045d21b 100644
--- a/etc/zebradb/zebra-biblios.cfg
+++ b/etc/zebradb/zebra-biblios.cfg
@@ -3,7 +3,7 @@
 # $Id: zebra.cfg,v 1.1.2.2 2006/05/09 12:03:16 rangi Exp $
 #
 # Where are the config files located?
-profilePath:__ZEBRA_CONF_DIR__/biblios/etc:__ZEBRA_CONF_DIR__/zebradb/etc
+profilePath:__ZEBRA_CONF_DIR__/biblios/etc:__ZEBRA_CONF_DIR__/etc:__ZEBRA_CONF_DIR__/marc_defs/__ZEBRA_MARC_FORMAT__:__ZEBRA_CONF_DIR__/lang_defs/__ZEBRA_LANGUAGE__
 # modulePath - where to look for loadable zebra modules
 modulePath: /usr/lib/idzebra-2.0/modules
 
diff --git a/rewrite-config.PL b/rewrite-config.PL
index 11d4c0f8ec..8a27873a97 100644
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -102,6 +102,8 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
   '__ZEBRA_LOCK_DIR__' => "$prefix/var/lock/zebradb",
   '__ZEBRA_DATA_DIR__' => "$prefix/var/lib/zebradb",
   '__ZEBRA_RUN_DIR__' => "$prefix/var/run/zebradb",
+  '__ZEBRA_MARC_FORMAT__' => 'marc21',
+  '__ZEBRA_LANGUAGE__' => 'en',
 );
 
 # Override configuration from the environment