diff --git a/Configure b/Configure
index 78c9972cfc3..437d66bfa15 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Mon Jul 30 05:36:10 EET DST 2001 [metaconfig 3.0 PL70]
+# Generated on Mon Jul 30 06:47:25 EET DST 2001 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -6766,10 +6766,9 @@ else
 fi
 
 echo " "
-echo "Any extra modules..." >&4
 case "$extras" in
-'') dflt='y';;
-*) dflt='n';;
+'') dflt='n';;
+*) dflt='y';;
 esac
 cat <<EOM
 Perl can be built with extra modules or bundles of modules which
diff --git a/Makefile.SH b/Makefile.SH
index 5623341e251..1a1bc098e12 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -222,6 +222,8 @@ OPTIMIZE = $optimize
 
 EXTRAS = $extras
 
+INSTALLPREFIXEXP = $prefix
+
 !GROK!THIS!
 # not used by Makefile but by installperl;
 # mentioned here so that metaconfig picks these up
@@ -303,7 +305,7 @@ lintflags = -hbvxac
 
 .PHONY: all compile translators utilities
 
-all: $(FIRSTMAKEFILE) miniperl extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext)
+all: $(FIRSTMAKEFILE) miniperl extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
 	@echo " ";
 	@echo "	Everything is up to date. 'make test' to run test suite."
 
@@ -662,8 +664,24 @@ extra.pods: miniperl
 	    cd pod ; $(LNS) ../$$x "perl"$$nx".pod" ; cd .. ; \
 	    echo "pod/perl"$$nx".pod" >> extra.pods ; \
 	done
+	-@rm -f pod/perlvms.pod
 	-@test -f vms/perlvms.pod && cd pod && $(LNS) ../vms/perlvms.pod perlvms.pod && cd .. && echo "pod/perlvms.pod" >> extra.pods
 
+extras.prep: perl
+	@echo "CPAN needs to be configured..."
+	@echo
+	-@test -f extras.lst || touch extras.lst
+
+extras.make: extras.prep
+	$(LDLIBPTH) PATH=`pwd`:`pwd`/pod:${PATH} ./perl -Ilib -MCPAN -e 'make(@ARGV)' `cat extras.lst`
+
+extras.test: extras.prep
+	$(LDLIBPTH) PATH=`pwd`:`pwd`/pod:${PATH} ./perl -Ilib -MCPAN -e 'test(@ARGV)' `cat extras.lst`
+
+extras.install: extras.prep
+	-@test -f extras.lst || touch extras.lst
+	$(LDLIBPTH) PATH=`pwd`:`pwd`/pod:${PATH} ./perl -Ilib -MCPAN -e 'install(@ARGV)' `cat extras.lst`
+
 .PHONY: install install-strip install-all install-verbose install-silent \
 	no-install install.perl install.man installman install.html installhtml
 
@@ -682,7 +700,7 @@ install-silent:
 no-install:
 	$(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-n
 
-install.perl:	all installperl extras.lst
+install.perl:	all installperl
 	if [ -n "$(COMPILE)" ]; \
 	then \
 		cd utils; $(MAKE) compile; \
@@ -691,6 +709,7 @@ install.perl:	all installperl extras.lst
 	else :; \
 	fi
 	$(LDLIBPTH) ./perl installperl $(INSTALLFLAGS) $(STRIPFLAGS)
+	$(MAKE) extras.install
 
 install.man:	all installman
 	$(LDLIBPTH) ./perl installman $(INSTALLFLAGS)
@@ -856,7 +875,7 @@ realclean:	_realcleaner _mopup
 
 _clobber:
 	-@rm -f Cross/run-* Cross/to-* Cross/from-*
-	rm -f config.sh cppstdin Policy.sh
+	rm -f config.sh cppstdin Policy.sh extras.lst
 
 clobber:	_realcleaner _mopup _clobber