2 files changed, 8 insertions, 0 deletions
diff --git a/Master/texmf-dist/scripts/xindy/texindy.pl b/Master/texmf-dist/scripts/xindy/texindy.pl
index 5cfba08d699..06c57fd31c2 100755
--- a/Master/texmf-dist/scripts/xindy/texindy.pl
+++ b/Master/texmf-dist/scripts/xindy/texindy.pl
@@ -525,6 +525,7 @@ exec_xindy(@opt, @ARGV);
 
 sub exec_xindy {
     if ( $is_w32 ) {
+	$xindy = quotify($xindy);
 	system ($EXECUTABLE_NAME, $xindy, @_);
 	if ($? == -1) {
 	    die "$cmd: could not execute xindy: $ERRNO\n";
@@ -643,6 +644,12 @@ sub output_xindy_release () {
     print "xindy release: $version\n";
 }
 
+sub quotify ( $ ) {
+    my $s = shift;
+    $s =~ s:([\\\"]):\\$1:g ;
+    return "\"$s\"";
+}
+
 
 
 #======================================================================
diff --git a/Master/texmf-dist/scripts/xindy/xindy.pl b/Master/texmf-dist/scripts/xindy/xindy.pl
index 8b48bb197f5..8eca24fd9c4 100755
--- a/Master/texmf-dist/scripts/xindy/xindy.pl
+++ b/Master/texmf-dist/scripts/xindy/xindy.pl
@@ -706,6 +706,7 @@ sub filter_index ( $$ ) {
     my $output = tmpnam();
     push (@temp_files, $output);
     $output=quotify($output);
+    $filter=quotify($filter);
     print "Running filter: $filter <$input >$output\n"  if $verbose;
     system "$filter <$input >$output";
     print "filtered xindy input file: $output\n"  if $debug{script};