diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index bf1e5ff6326c..0b3750748a09 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20101123
-PORTREVISION=	1
+PORTVERSION=	20110403
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
@@ -20,7 +20,7 @@ COMMENT=	FreeBSD ports/packages management tool (devel version)
 OPTIONS=	BDB4 "Use Berkeley DB >=2 as backend" on \
 		BDB1 "Use Berkeley DB 1.85 as backend" off
 
-CONFLICTS=	portupgrade-[0-9]*
+CONFLICTS_INSTALL=	portupgrade-[0-9]*
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index d22a8934ff5a..1e0d54710592 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkgtools-20101123.tar.bz2) = b4843285a2c4c37f62936a1a0f806559901e4386cccc5cc459c848ae46443e38
-SIZE (pkgtools-20101123.tar.bz2) = 120443
+SHA256 (pkgtools-20110403.tar.bz2) = 8833c3136f61c525213d26c487ec1a705a76bf478b0f64c88a34967538974876
+SIZE (pkgtools-20110403.tar.bz2) = 115128
diff --git a/ports-mgmt/portupgrade-devel/files/patch-bin-Makefile b/ports-mgmt/portupgrade-devel/files/patch-bin-Makefile
deleted file mode 100644
index e2e483d26f07..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-bin-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/Makefile.orig	2010-11-24 05:29:20.000000000 +0900
-+++ bin/Makefile	2010-11-24 16:19:06.587423414 +0900
-@@ -28,7 +28,7 @@
- 	${RUBY} -pe ' \
- 		if $$. == 1; \
- 		 if /^#!/; \
--		  $$_.sub(/^#!\s*\S*(\benv\s+)?\bruby/, "#!${RUBY}"); \
-+		  $$_.sub!(/^#!\s*\S*(\benv\s+)?\bruby/, "#!${RUBY}"); \
- 		 else; \
- 		  $$_ = "#!${RUBY}\n" + $$_; \
- 		 end; \