diff --git a/net-mgmt/p5-Net-IP/Makefile b/net-mgmt/p5-Net-IP/Makefile
index 9b8780050b03..6b65386dec39 100644
--- a/net-mgmt/p5-Net-IP/Makefile
+++ b/net-mgmt/p5-Net-IP/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Net-IP
-PORTVERSION=	1.20
+PORTVERSION=	1.21
 CATEGORIES=	net-mgmt perl5 ipv6
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
@@ -19,4 +19,9 @@ PERL_CONFIGURE=	yes
 
 MAN3=		Net::IP.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${PERL_LEVEL} <= 500800
+post-patch:
+	@${PERL} -pi -e '$$_ = "" if m|use 5.008|' ${WRKSRC}/Makefile.PL
+.endif
+.include <bsd.port.post.mk>
diff --git a/net-mgmt/p5-Net-IP/distinfo b/net-mgmt/p5-Net-IP/distinfo
index 55223b258234..493164c2d0c8 100644
--- a/net-mgmt/p5-Net-IP/distinfo
+++ b/net-mgmt/p5-Net-IP/distinfo
@@ -1,2 +1,2 @@
-MD5 (Net-IP-1.20.tar.gz) = 73c5941562833d5ca7ca7c3bff7983fe
-SIZE (Net-IP-1.20.tar.gz) = 24630
+MD5 (Net-IP-1.21.tar.gz) = 1a4163b626a743ca5a76e04cc00fa73d
+SIZE (Net-IP-1.21.tar.gz) = 25304
diff --git a/net-mgmt/p5-Net-IP/files/patch-Makefile.PL b/net-mgmt/p5-Net-IP/files/patch-Makefile.PL
deleted file mode 100644
index 4c3e31b0eec2..000000000000
--- a/net-mgmt/p5-Net-IP/files/patch-Makefile.PL
+++ /dev/null
@@ -1,7 +0,0 @@
---- Makefile.PL.orig	Tue Jul  1 09:19:12 2003
-+++ Makefile.PL	Tue Jul  1 09:19:34 2003
-@@ -1,4 +1,3 @@
--use 5.008;
- use ExtUtils::MakeMaker;
- use Config;
- # See lib/ExtUtils/MakeMaker.pm for details of how to influence