--- perl-5.8.8/pp_ctl.c.orig	2009-01-16 13:13:23.000000000 -0800
+++ perl-5.8.8/pp_ctl.c	2009-01-16 13:13:58.000000000 -0800
@@ -3008,37 +3008,7 @@
 STATIC PerlIO *
 S_doopen_pm(pTHX_ const char *name, const char *mode)
 {
-#ifndef PERL_DISABLE_PMC
-    const STRLEN namelen = strlen(name);
-    PerlIO *fp;
-
-    if (namelen > 3 && strEQ(name + namelen - 3, ".pm")) {
-	SV * const pmcsv = Perl_newSVpvf(aTHX_ "%s%c", name, 'c');
-	const char * const pmc = SvPV_nolen_const(pmcsv);
-	Stat_t pmcstat;
-	if (PerlLIO_stat(pmc, &pmcstat) < 0) {
-	    fp = check_type_and_open(name, mode);
-	}
-	else {
-	    Stat_t pmstat;
-	    if (PerlLIO_stat(name, &pmstat) < 0 ||
-	        pmstat.st_mtime < pmcstat.st_mtime)
-	    {
-		fp = check_type_and_open(pmc, mode);
-	    }
-	    else {
-		fp = check_type_and_open(name, mode);
-	    }
-	}
-	SvREFCNT_dec(pmcsv);
-    }
-    else {
-	fp = check_type_and_open(name, mode);
-    }
-    return fp;
-#else
     return check_type_and_open(name, mode);
-#endif /* !PERL_DISABLE_PMC */
 }
 
 PP(pp_require)
--- perl-5.8.8/perl.c.orig	2009-01-16 16:32:36.000000000 -0800
+++ perl-5.8.8/perl.c	2009-01-19 13:19:27.000000000 -0800
@@ -4942,11 +4942,6 @@
 	 * archname-specific sub-directories.
 	 */
 	if (addsubdirs || addoldvers) {
-#ifdef PERL_INC_VERSION_LIST
-	    /* Configure terminates PERL_INC_VERSION_LIST with a NULL */
-	    const char *incverlist[] = { PERL_INC_VERSION_LIST };
-	    const char **incver;
-#endif
 #ifdef VMS
 	    char *unix;
 	    STRLEN len;
@@ -4990,15 +4985,6 @@
 
 	    }
 
-#ifdef PERL_INC_VERSION_LIST
-	    if (addoldvers) {
-		for (incver = incverlist; *incver; incver++) {
-		    /* .../xxx if -d .../xxx */
-		    Perl_sv_setpvf(aTHX_ subdir, "%"SVf PERL_ARCH_FMT, libdir, *incver);
-		    subdir = S_incpush_if_exists(aTHX_ subdir);
-		}
-	    }
-#endif
 	}
 
 	/* finally push this lib directory on the end of @INC */
--- perl-5.8.8/Configure.orig	2009-01-16 19:49:16.000000000 -0800
+++ perl-5.8.8/Configure	2009-01-19 15:52:23.000000000 -0800
@@ -6886,55 +6886,12 @@
 	$cat >> getverlist <<'EOPL'
 # Can't have leading @ because metaconfig interprets it as a command!
 ;@inc_version_list=();
-# XXX Redo to do opendir/readdir? 
-if (-d $stem) {
-    chdir($stem);
-    ;@candidates = glob("5.*");
-}
-else {
-    ;@candidates = ();
-}
-
-# XXX ToDo:  These comparisons must be reworked when two-digit
-# subversions come along, so that 5.7.10 compares as greater than
-# 5.7.3!  By that time, hope that 5.6.x is sufficiently
-# widespread that we can use the built-in version vectors rather
-# than reinventing them here.  For 5.6.0, however, we must
-# assume this script will likely be run by 5.005_0x.  --AD 1/2000.
-foreach $d (@candidates) {
-    if ($d lt $version) {
-	if ($d ge $api_versionstring) {
-	    unshift(@inc_version_list, grep { -d } "$d/$archname", $d);
-	}
-	elsif ($d ge "5.005") {
-	    unshift(@inc_version_list, grep { -d } $d);
-	}
-    }
-    else {
-	# Skip newer version.  I.e. don't look in
-	# 5.7.0 if we're installing 5.6.1.
-    }
-}
 
-if (@inc_version_list) {
-    print join(' ', @inc_version_list);
-}
-else {
-    # Blank space to preserve value for next Configure run.
-    print " ";
-}
+# Blank space to preserve value for next Configure run.
+print " ";
 EOPL
 chmod +x getverlist
-case "$inc_version_list" in
-'')	if test -x "$perl5$exe_ext"; then
-		dflt=`$perl5 getverlist`
-	else
-		dflt='none'
-	fi
-	;;
-$undef) dflt='none' ;;
-*)  eval dflt=\"$inc_version_list\" ;;
-esac
+dflt='none'
 case "$dflt" in
 ''|' ') dflt=none ;;
 esac
@@ -6961,13 +6918,8 @@
 [Nn]one|''|' '|$undef) inc_version_list=' ' ;;
 *) inc_version_list="$ans" ;;
 esac
-case "$inc_version_list" in
-''|' ') 
-	inc_version_list_init='0';;
-*)	inc_version_list_init=`echo $inc_version_list |
-		$sed -e 's/^/"/' -e 's/ /","/g' -e 's/$/",0/'`
-	;;
-esac
+
+inc_version_list_init='0'
 $rm -f getverlist
 
 : determine whether to install perl also as /usr/bin/perl
@@ -8500,11 +8452,8 @@
 set versiononly
 eval $setvar
 
-case "$versiononly" in
-"$define") inc_version_list=''
-           inc_version_list_init=0
-           ;;
-esac
+inc_version_list=''
+inc_version_list_init=0
 
 : figure out how to guarantee perl startup
 case "$startperl" in