diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index bb8ac0ee24a7..a03065dd7aa3 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -13,11 +13,11 @@ MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+DISTFILES+=	OOo_SRC680_m${MILESTONE}_source.tar.bz2
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
-EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index d44e6853e590..f592b1f162bd 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85
-SHA256 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7
-SIZE (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 235392588
+MD5 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85
+SHA256 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7
+SIZE (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 235392588
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index bb8ac0ee24a7..a03065dd7aa3 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -13,11 +13,11 @@ MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+DISTFILES+=	OOo_SRC680_m${MILESTONE}_source.tar.bz2
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
-EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index d44e6853e590..f592b1f162bd 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85
-SHA256 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7
-SIZE (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 235392588
+MD5 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85
+SHA256 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7
+SIZE (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 235392588
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index bb8ac0ee24a7..a03065dd7aa3 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -13,11 +13,11 @@ MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+DISTFILES+=	OOo_SRC680_m${MILESTONE}_source.tar.bz2
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
-EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index d44e6853e590..f592b1f162bd 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85
-SHA256 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7
-SIZE (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 235392588
+MD5 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85
+SHA256 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7
+SIZE (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 235392588
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index bb8ac0ee24a7..a03065dd7aa3 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -13,11 +13,11 @@ MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+DISTFILES+=	OOo_SRC680_m${MILESTONE}_source.tar.bz2
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
-EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index d44e6853e590..f592b1f162bd 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85
-SHA256 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7
-SIZE (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 235392588
+MD5 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85
+SHA256 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7
+SIZE (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 235392588
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index bb8ac0ee24a7..a03065dd7aa3 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -13,11 +13,11 @@ MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+DISTFILES+=	OOo_SRC680_m${MILESTONE}_source.tar.bz2
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
-EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index d44e6853e590..f592b1f162bd 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85
-SHA256 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7
-SIZE (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 235392588
+MD5 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85
+SHA256 (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7
+SIZE (openoffice.org2.0/OOo_SRC680_m145_source.tar.bz2) = 235392588
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917