diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 62c1ec0bb936..6bf18cb6525e 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020805
+PORTVERSION=	20020830
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
 DISTNAME=	pkgtools-${DISTVERSION}
 
-DISTVERSION=	${PORTVERSION}
+DISTVERSION=	20020805
 
 .if ${DISTVERSION} != ${PORTVERSION}
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	${DISTNAME}-${DISTVERSION}-${PORTVERSION}.diff.bz2
+PATCHFILES=	${DISTNAME}-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index a1cb5bab9fb0..a97ed62e9fb8 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1 +1,2 @@
 MD5 (pkgtools-20020805.tar.bz2) = bb5a2eda513960ffc22edcaa2c330530
+MD5 (pkgtools-20020805-20020830.diff.bz2) = 76a59579cc81dd20a4c1513f7543352e
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 62c1ec0bb936..6bf18cb6525e 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020805
+PORTVERSION=	20020830
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
 DISTNAME=	pkgtools-${DISTVERSION}
 
-DISTVERSION=	${PORTVERSION}
+DISTVERSION=	20020805
 
 .if ${DISTVERSION} != ${PORTVERSION}
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	${DISTNAME}-${DISTVERSION}-${PORTVERSION}.diff.bz2
+PATCHFILES=	${DISTNAME}-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index a1cb5bab9fb0..a97ed62e9fb8 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1 +1,2 @@
 MD5 (pkgtools-20020805.tar.bz2) = bb5a2eda513960ffc22edcaa2c330530
+MD5 (pkgtools-20020805-20020830.diff.bz2) = 76a59579cc81dd20a4c1513f7543352e
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 62c1ec0bb936..6bf18cb6525e 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020805
+PORTVERSION=	20020830
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
 DISTNAME=	pkgtools-${DISTVERSION}
 
-DISTVERSION=	${PORTVERSION}
+DISTVERSION=	20020805
 
 .if ${DISTVERSION} != ${PORTVERSION}
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	${DISTNAME}-${DISTVERSION}-${PORTVERSION}.diff.bz2
+PATCHFILES=	${DISTNAME}-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index a1cb5bab9fb0..a97ed62e9fb8 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1 +1,2 @@
 MD5 (pkgtools-20020805.tar.bz2) = bb5a2eda513960ffc22edcaa2c330530
+MD5 (pkgtools-20020805-20020830.diff.bz2) = 76a59579cc81dd20a4c1513f7543352e
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 62c1ec0bb936..6bf18cb6525e 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020805
+PORTVERSION=	20020830
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
 DISTNAME=	pkgtools-${DISTVERSION}
 
-DISTVERSION=	${PORTVERSION}
+DISTVERSION=	20020805
 
 .if ${DISTVERSION} != ${PORTVERSION}
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	${DISTNAME}-${DISTVERSION}-${PORTVERSION}.diff.bz2
+PATCHFILES=	${DISTNAME}-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index a1cb5bab9fb0..a97ed62e9fb8 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1 +1,2 @@
 MD5 (pkgtools-20020805.tar.bz2) = bb5a2eda513960ffc22edcaa2c330530
+MD5 (pkgtools-20020805-20020830.diff.bz2) = 76a59579cc81dd20a4c1513f7543352e