gistfile1.txt

diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
index bd831a2..54c13b1 100644
--- a/tools/build/Makefile-JVM.in
+++ b/tools/build/Makefile-JVM.in
@@ -145,7 +145,7 @@ $(SETTING_JAR): $(PERL6_JAR) $(PERL6_B_JAR) $(J_CORE_SOURCES)
        $(J_RUN_PERL6) --setting=NULL --ll-exception --optimize=3 --target=jar --stagestats --output=$(SETTING_JAR) --nqp-lib=blib $(J_BUILD_DIR)/CORE.setting
 
 $(J_RUNNER):    tools/build/create-jvm-runner.pl
-       $(PERL5) tools/build/create-jvm-runner.pl dev . . $(NQP_PREFIX) $(NQP_JARS)
+       $(PERL5) tools/build/create-jvm-runner.pl dev . . $(NQP_PREFIX) --nqp-lib=blib $(NQP_JARS)
 
 j-runner-default: j-all
        $(CP) $(J_RUNNER) perl6$(J_BAT)
@@ -157,7 +157,7 @@ $(PERL6_DEBUG_JAR): src/perl6-debug.nqp $(PERL6_JAR)
            $(J_BUILD_DIR)/perl6-debug.nqp
 
 $(J_DEBUG_RUNNER): tools/build/create-jvm-runner.pl $(PERL6_DEBUG_JAR)
-       $(PERL5) tools/build/create-jvm-runner.pl dev-debug . . $(NQP_PREFIX) $(NQP_JARS)
+       $(PERL5) tools/build/create-jvm-runner.pl dev-debug . . $(NQP_PREFIX) --nqp-lib=blib $(NQP_JARS)
 
 eval-client.pl:
        $(CP) $(SDKROOT)$(NQP_PREFIX)/bin/eval-client.pl .
@@ -220,11 +220,11 @@ j-install: j-all tools/build/create-jvm-runner.pl tools/build/install-core-dist.
        $(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site
        .@slash@$(J_RUNNER) tools/build/upgrade-repository.pl $(DESTDIR)$(PERL6_LANG_DIR)/site
        .@slash@$(J_RUNNER) tools/build/install-core-dist.pl $(DESTDIR)$(PERL6_LANG_DIR)
-       $(PERL5) tools/build/create-jvm-runner.pl install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) $(NQP_JARS)
-       $(PERL5) tools/build/create-jvm-runner.pl install-debug "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) $(NQP_JARS)
+       $(PERL5) tools/build/create-jvm-runner.pl install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) "" $(NQP_JARS)
+       $(PERL5) tools/build/create-jvm-runner.pl install-debug "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) "" $(NQP_JARS)
 
 j-runner-default-install: j-install
-       $(PERL5) tools/build/create-jvm-runner.pl install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) $(NQP_JARS)
+       $(PERL5) tools/build/create-jvm-runner.pl install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) "" $(NQP_JARS)
        $(CP) $(DESTDIR)$(PREFIX)/bin/perl6-j$(J_BAT) $(DESTDIR)$(PREFIX)/bin/perl6$(J_BAT)
        $(CHMOD) 755 $(DESTDIR)$(PREFIX)/bin/perl6$(J_BAT)
 
diff --git a/tools/build/create-jvm-runner.pl b/tools/build/create-jvm-runner.pl
index ea4a78a..8505c56 100644
--- a/tools/build/create-jvm-runner.pl
+++ b/tools/build/create-jvm-runner.pl
@@ -7,9 +7,9 @@ use 5.008;
 use File::Spec;
 use File::Copy 'cp';
 
-my $USAGE = "Usage: $0 <type> <destdir> <prefix> <nqp prefix> <third party jars>\n";
+my $USAGE = "Usage: $0 <type> <destdir> <prefix> <nqp prefix> <blib> <third party jars>\n";
 
-my ($type, $destdir, $prefix, $nqpprefix, $thirdpartyjars) = @ARGV
+my ($type, $destdir, $prefix, $nqpprefix, $blib, $thirdpartyjars) = @ARGV
     or die $USAGE;
 
 my $debugger = 0;
@@ -43,6 +43,7 @@ my $preamble = $^O eq 'MSWin32' ? '@' : "#!/bin/sh
 : \${PERL6_JARS:=\"$perl6jars\"}
 exec ";
 my $postamble = $^O eq 'MSWin32' ? ' %*' : ' "$@"';
+$postamble = "$blib $postamble" if $blib;
 
 sub install {
     my ($name, $command) = @_;