diff --git a/Configure.pl b/Configure.pl
index 0d98d59..de61435 100644
--- a/Configure.pl
+++ b/Configure.pl
@@ -9,7 +9,7 @@ use Getopt::Long;
 MAIN: {
     my %options;
     GetOptions(\%options, 'help!', 'parrot-config=s',
-               'gen-parrot!', 'gen-parrot-option=s@');
+               'gen-parrot!', 'gen-parrot-option=s@', 'check-parrot-revision!');
 
     # Print help if it's requested
     if ($options{'help'}) {
@@ -17,16 +17,6 @@ MAIN: {
         exit(0);
     }
 
-    # Update/generate parrot build if needed
-    if ($options{'gen-parrot'}) {
-        my @opts    = @{ $options{'gen-parrot-option'} || [] };
-        my @command = ($^X, "build/gen_parrot.pl", @opts);
-
-        print "Generating Parrot ...\n";
-        print "@command\n\n";
-        system @command;
-    }
-
     # Get a list of parrot-configs to invoke.
     my @parrot_config_exe = qw(
         parrot/parrot_config
@@ -38,6 +28,38 @@ MAIN: {
         @parrot_config_exe = ($options{'parrot-config'});
     }
 
+    # Check used by Makefile to be sure that Parrot revision is okay.
+    if ($options{'check-parrot-revision'}) {
+        my $parrot_revision;
+        for my $exe (@parrot_config_exe) {
+            no warnings;
+            if (open my $PARROT_CONFIG, '-|', "$exe revision") {
+                while (<$PARROT_CONFIG>) {
+                    y/\r\n//d;
+                    $parrot_revision = $_;
+                }
+                close $PARROT_CONFIG;
+                last if $parrot_revision;
+            }
+        }
+
+        if ($parrot_revision && minimal_parrot_revision() > $parrot_revision) {
+            print "\nwarning: Parrot is out of date... re-run Configure.pl with --gen-parrot option.\n\n";
+        }
+
+        exit(0);
+    }
+
+    # Update/generate parrot build if needed
+    if ($options{'gen-parrot'}) {
+        my @opts    = @{ $options{'gen-parrot-option'} || [] };
+        my @command = ($^X, "build/gen_parrot.pl", @opts);
+
+        print "Generating Parrot ...\n";
+        print "@command\n\n";
+        system @command;
+    }
+
     #  Get configuration information from parrot_config
     my %config = read_parrot_config(@parrot_config_exe);
     unless (%config) {
@@ -50,6 +72,19 @@ the location of parrot_config.
 END
     }
 
+    # Check if Parrot revision isn't too old
+    my $min_parrot_rev = minimal_parrot_revision();
+
+    printf "\nFound Parrot r%d (needed at least: r%d)\n", $config{revision}, $min_parrot_rev;
+
+    if ($min_parrot_rev > $config{revision}) {
+        die <<'END';
+Your Parrot is too old!
+To automatically checkout (svn) and build a copy of parrot,
+try re-running Configure.pl with the '--gen-parrot' option.
+END
+    }
+
 #  Create the Makefile using the information we just got
     create_makefile(%config);
 
@@ -119,6 +154,11 @@ sub slurp {
     return $maketext;
 }
 
+sub minimal_parrot_revision {
+    my $rev = slurp('build/PARROT_REVISION');
+    $rev =~ y/\r\n//d;
+    return $rev;
+}
 
 #  Print some help text.
 sub print_help {
diff --git a/build/Makefile.in b/build/Makefile.in
index ebf1a82..901ce00 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -333,7 +333,8 @@ help:
 	@echo "  help:              Print this help message."
 	@echo ""
 
-Makefile: build/Makefile.in
+Makefile: build/Makefile.in build/PARROT_REVISION
+	@$(PERL) Configure.pl --check-parrot-revision
 	@echo ""
 	@echo "warning: Makefile is out of date... re-run Configure.pl"
 	@echo ""
diff --git a/build/gen_parrot.pl b/build/gen_parrot.pl
index 23b548b..b356299 100644
--- a/build/gen_parrot.pl
+++ b/build/gen_parrot.pl
@@ -42,6 +42,9 @@ close $REQ;
     }
 }
 
+print "Cleaning up Rakudo...\n";
+system(qw(make clean));
+
 print "Checking out Parrot r$required via svn...\n";
 system(qw(svn checkout -r),  $required , qw(https://svn.parrot.org/parrot/trunk parrot));