diff -ur /home/rmb1/temp/perl/perl-current/Makefile.SH ./Makefile.SH
--- /home/rmb1/temp/perl/perl-current/Makefile.SH	Mon Jun 20 11:22:26 2005
+++ ./Makefile.SH	Mon Jun 20 13:03:08 2005
@@ -304,7 +304,7 @@
 CCCMDSRC = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $<`
 
 CONFIGPM = lib/Config.pm lib/Config_heavy.pl
-private = preplibrary $(CONFIGPM) lib/ExtUtils/Miniperl.pm
+private = preplibrary $(CONFIGPM) lib/Config.pod lib/ExtUtils/Miniperl.pm
 
 # Files to be built with variable substitution before miniperl
 # is available.
@@ -766,14 +766,15 @@
 		autosplit_lib_modules(@ARGV)' lib/*/*.pm
 	$(MAKE) lib/re.pm
 
-# Take care to avoid modifying lib/Config.pm without reason
+# Take care to avoid modifying lib/Config.pm lib/Config_heavy.pl without reason
 # (If trying to create a new port and having problems with the configpm script,
 # try 'make minitest' and/or commenting out the tests at the end of configpm.)
-$(CONFIGPM): config.sh miniperl$(EXE_EXT) configpm Porting/Glossary
-	$(LDLIBPTH) ./miniperl -Ilib configpm --heavy=lib/Config_heavy.pl configpm.tmp
-	sh mv-if-diff configpm.tmp lib/Config.pm
+configpm.bundle lib/Config.pod: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary
+	$(LDLIBPTH) ./miniperl -Ilib configpm --heavy=config_heavy.tmp --bundle=configpm_bundle.tmp configpm.tmp
+	sh mv-if-diff configpm_bundle.tmp configpm.bundle
 
-lib/Config.pm: lib/Config_heavy.pl
+$(CONFIGPM): configpm.bundle
+	./miniperl configpm.bundle lib/Config.pm lib/Config_heavy.pl
 
 lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl $(CONFIGPM)
 	$(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp
@@ -1033,7 +1034,7 @@
 	rm -f so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR)
 	rm -rf $(addedbyconf)
 	rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old
-	rm -f $(private) lib/Config.pod
+	rm -f $(private) configpm.bundle
 	rm -rf $(unidatafiles) $(unidatadirs)
 	rm -rf lib/auto
 	rm -f lib/.exists lib/*/.exists lib/*/*/.exists
diff -ur /home/rmb1/temp/perl/perl-current/configpm ./configpm
--- /home/rmb1/temp/perl/perl-current/configpm	Mon Jun 20 11:21:03 2005
+++ ./configpm	Mon Jun 20 13:04:26 2005
@@ -23,7 +23,8 @@
     'cross'    => '', # --cross=PLATFORM - crosscompiling for PLATFORM
     'glossary' => 1,  # --no-glossary  - no glossary file inclusion,
                       #                  for compactness
-    'heavy' => '',   # pathname of the Config_heavy.pl file
+    'heavy'    => '', # pathname of the Config_heavy.pl file
+    'bundle'   => '', # pathname of configpm bundle file
 );
 
 sub opts {
@@ -884,7 +885,33 @@
 	;
 
 
+exit 0 unless $Opts{bundle};
+
+open BUNDLE, '>'.$Opts{bundle} or die "Can't open $Opts{bundle}: $!\n";
+print BUNDLE<<'UNBUNDLE';
+open CONFIG, '>'. shift or die "Can't open 'Config.pm' file: $!\n";
+open CONFIG_HEAVY, '>'. shift or die "Can't open '_heavy.pl' file: $!\n";
+while( <DATA> ) { last if /^#### heavy ####$/; print CONFIG }
+while( <DATA> ) { print CONFIG_HEAVY }
+close CONFIG or die $!;
+close CONFIG_HEAVY or die $!;
+UNBUNDLE
+
+print BUNDLE "__DATA__\n"; 
+open CONFIG, $Config_PM or die "Can't open $Config_PM: $!\n";
+while( <CONFIG> ) { print BUNDLE }
+print BUNDLE "#### heavy ####\n";
+open CONFIG_HEAVY, $Config_heavy or die "Can't open $Config_heavy: $!\n";
+while( <CONFIG_HEAVY> ) { print BUNDLE }
+
+close BUNDLE or die;
+close CONFIG or die $!;
+close CONFIG_HEAVY or die $!;
+
+unlink $Config_PM or die $!;
+unlink $Config_heavy or die $!;
 exit 0;
+
 # Popularity of various entries in %Config, based on a large build and test
 # run of code in the Fotango build system:
 __DATA__
@@ -933,7 +960,7 @@
 installvendorman1dir:	489
 installvendorman3dir:	489
 d_flexfnam:	474
-eunicefix:	360
+enicefix:	360
 d_link:	347
 installsitearch:	344
 installscript:	341