diff --git a/Changes b/Changes
index ce2a711..b899d6c 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,10 @@
 Revision history for Perl extension NetAddr::IP
 
+4.021  Wed Dec 10 11:09:36 PST 2008
+	Removed test code that produces a warning about all perl versions, 
+	OOPS!! instead of just the buggy 5.8.0 - 5.8.5 versions.
+	Thanks to paul@city-fan.org for reporting this.
+
 4.020  Tue Dec  9 16:25:46 PST 2008
 	cleaned up various typo's with good patch from
 	Rob Riepel <riepel@networking.Stanford.EDU>
diff --git a/IP.pm b/IP.pm
index dc17da9..06e7cf7 100644
--- a/IP.pm
+++ b/IP.pm
@@ -4,8 +4,8 @@
 
 use strict;
 #use diagnostics;
-use NetAddr::IP::Lite 1.12 qw(Zero Zeros Ones V4mask V4net);
-use NetAddr::IP::Util 1.25 qw(
+use NetAddr::IP::Lite 1.13 qw(Zero Zeros Ones V4mask V4net);
+use NetAddr::IP::Util 1.27 qw(
 	sub128
 	inet_aton
 	inet_any2n
@@ -34,7 +34,7 @@
 
 @ISA = qw(Exporter NetAddr::IP::Lite);
 
-$VERSION = do { sprintf " %d.%03d", (q$Revision: 4.20 $ =~ /\d+/g) };
+$VERSION = do { sprintf " %d.%03d", (q$Revision: 4.21 $ =~ /\d+/g) };
 
 =pod
 
@@ -1470,7 +1470,10 @@
 
 	Fixed core dump due to bug in perl 5.8.4 handling of
 	@_ in goto &sub operations. Unfortunately this version
-	of perl is standard on Solaris -- it should be upgraded!
+	of perl is standard on Solaris, 5.85 on RedHat and I'm
+	sure other distributions. -- all should be upgraded!
+	Similar behavior exists in perl versions 5.80 - 5.85
+	See perl bug [ 23429].
 
 	Included missing code to parse BCD numbers as argument
 	to sub new(bcdnum). Thanks to Carlos Vicente cvicente@cpan.org
diff --git a/Lite/Util/Makefile.PL b/Lite/Util/Makefile.PL
index a726adc..d9e19c0 100644
--- a/Lite/Util/Makefile.PL
+++ b/Lite/Util/Makefile.PL
@@ -43,7 +43,8 @@
     LIBS		=> [],
     XS			=> {},
     C			=> [],
-    clean		=> { FILES    => "*.bs *.o *.c *~ tmp* Util_IS.pm config.log config.h config.status localperl.h auto*"},
+    clean		=> { FILES    => "*.bs *.o *.c *~ tmp* Util_IS.pm localperl.h auto*"},
+    realclean		=> { FILES    => "config.h config.log config.status"},
     dist		=> {COMPRESS=>'gzip', SUFFIX=>'gz'}
 
 );
diff --git a/META.yml b/META.yml
index b43cbbf..aa428cf 100644
--- a/META.yml
+++ b/META.yml
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                NetAddr-IP
-version:             4.020
+version:             4.021
 abstract:            Manages IPv4 and IPv6 addresses and subnets
 license:             ~
 author:              
diff --git a/Makefile.PL b/Makefile.PL
index 98b4d12..72f603e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -10,7 +10,7 @@
 my $view = $then +86400 < $now ? 5:0;
 
 my $pv = sprintf "%vd", $^V;
-unless (0 && $pv lt '5.8.0' || $pv gt '5.8.5') {
+unless ($pv lt '5.8.0' || $pv gt '5.8.5') {
   print
 qq(
 #################################################################
@@ -19,7 +19,8 @@
 #        YOUR VERSION OF PERL = $pv HAS SERIOUS BUGS		#
 #								#
 # Early versions of perl 5.8.x contain bugs that cause certain 	#
-# \@_ operations to fail. Please upgrade to at least perl 5.8.6 	#
+# \@_ operations to fail. 	See perl bug [ 23429]			#
+#	Please upgrade to at least perl 5.8.6			#
 #                                                              	# 
 ################################################################# 
 );