Index: tools/dev/mk_inno.pl
===================================================================
--- tools/dev/mk_inno.pl	(revision 7893)
+++ tools/dev/mk_inno.pl	(working copy)
@@ -26,6 +26,10 @@
 
 The parrot version.
 
+=item C<icudatadir>
+
+The directory to locate ICU's data file(s).
+
 =back
 
 =head1 SEE ALSO
@@ -36,9 +40,12 @@
 
 ################################################################################
 
+use strict;
+
 my %options = (
 		version => 'x.y.z',
 		prefix => '\usr\local\parrot',
+		icudatadir => '',
 );
 
 foreach (@ARGV) {
@@ -48,7 +55,18 @@
 }
 
 $options{prefix} =~ s/\//\\/g;
+$options{icudatadir} =~ s/\//\\/g;
 
+my $icu_section = '';
+if ($options{icudatadir}) {
+	my $icuroot = $options{icudatadir};
+	$icuroot =~ s/\\\w+$//;
+	$icu_section = qq{
+Source: "$icuroot\\share\\icu\\3.2\\license.html"; DestDir: "{app}\\icu"; Flags:
+Source: "$icuroot\\lib\\icu*.dll"; DestDir: "{app}\\bin"; Flags:
+};
+}
+
 open OUT, "> parrot.iss" or die "Can't open parrot.iss";
 
 print OUT qq{
@@ -73,6 +91,7 @@
 
 [Files]
 Source: "$options{prefix}\\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
+${icu_section}
 
 [Icons]
 Name: "{group}\\{cm:UninstallProgram,parrot}"; Filename: "{uninstallexe}"
Index: config/gen/makefiles/root.in
===================================================================
--- config/gen/makefiles/root.in	(revision 7893)
+++ config/gen/makefiles/root.in	(working copy)
@@ -1346,8 +1346,8 @@
 	sudo cp parrot.spec /usr/src/*/SPECS
 	cd /usr/src/*/SPECS ${make_and} sudo rpm -ba parrot.spec
 
-win32-inno-installer : install
-	$(PERL) tools/dev/mk_inno.pl --version=$(VERSION) --prefix=$(PREFIX)
+win32-inno-installer : world install
+	$(PERL) tools/dev/mk_inno.pl --version=$(VERSION) --prefix=$(PREFIX) --icudatadir=${icu_datadir}
 	$(INNO_SETUP) /Q parrot.iss
 
 ###############################################################################