3 files changed, 15 insertions, 0 deletions
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL
index 83b002074f2..49cf2e5154d 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL
@@ -1,6 +1,11 @@
 ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx
 =================================================
 
+2012-04-20  Norbert Preining  <preining@logic.at>
+
+	* dvipdfmx.c: allow inclusion of subsidiary config files, directive i
+	* data/config/dvipdfmx.cfg: document the i directive
+
 2012-03-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Remove extern decls from *.c files.
diff --git a/Build/source/texk/xdvipdfmx/data/config/dvipdfmx.cfg b/Build/source/texk/xdvipdfmx/data/config/dvipdfmx.cfg
index b3a22620fba..eaaed1793b8 100644
--- a/Build/source/texk/xdvipdfmx/data/config/dvipdfmx.cfg
+++ b/Build/source/texk/xdvipdfmx/data/config/dvipdfmx.cfg
@@ -183,3 +183,5 @@ f dvipdfm.map
 %% Put additonal fontmap files here
 f  cid-x.map
 
+%% Include additional config files
+%i <filename>
diff --git a/Build/source/texk/xdvipdfmx/src/dvipdfmx.c b/Build/source/texk/xdvipdfmx/src/dvipdfmx.c
index 05394e616f5..e6e210213eb 100644
--- a/Build/source/texk/xdvipdfmx/src/dvipdfmx.c
+++ b/Build/source/texk/xdvipdfmx/src/dvipdfmx.c
@@ -107,6 +107,9 @@ int always_embed = 0; /* always embed fonts, regardless of licensing flags */
 char *dvi_filename = NULL, *pdf_filename = NULL;
 
 static void
+read_config_file (const char *config);
+
+static void
 set_default_pdf_filename(void)
 {
   const char *dvi_base;
@@ -455,6 +458,11 @@ do_args (int argc, char *argv[])
           pdf_load_fontmap_file(argv[1], FONTMAP_RMODE_REPLACE);
         POP_ARG();
         break;
+      case 'i':
+        CHECK_ARG(1, "subsidiary config file");
+        read_config_file(argv[1]);
+        POP_ARG();
+        break;
       case 'e':
         WARN("dvipdfm \"-e\" option not supported.");
         break;