diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice-1.0/distinfo b/editors/openoffice-1.0/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice-1.0/distinfo
+++ b/editors/openoffice-1.0/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice-1.1/distinfo b/editors/openoffice-1.1/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice-1.1/distinfo
+++ b/editors/openoffice-1.1/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice.org-1.0/distinfo b/editors/openoffice.org-1.0/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice.org-1.0/distinfo
+++ b/editors/openoffice.org-1.0/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice.org-1.1/distinfo
+++ b/editors/openoffice.org-1.1/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index e8a5197240ce..321b55b5db04 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.a605
+PORTVERSION=	6.0.a609
 CATEGORIES=	editors
-MASTER_SITES=	http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
-DISTNAME=	oo_605_src
+MASTER_SITES=	http://a1580.g.akamai.net/7/1580/2064/OpenOffice609/anoncvs.openoffice.org/download/OpenOffice609/
+DISTNAME=	oo_609_src
+DISTFILES=	oo_609_src${EXTRACT_SUFX} solenv609_linuxintel${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/editors/openoffice/distinfo b/editors/openoffice/distinfo
index bc002ffc38b1..0451503da0b6 100644
--- a/editors/openoffice/distinfo
+++ b/editors/openoffice/distinfo
@@ -1 +1,2 @@
-MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
+MD5 (oo_609_src.tar.gz) = 7cd521da36e1e575eaf25243143c0264
+MD5 (solenv609_linuxintel.tar.gz) = 55a65597b56c6a5a25fad4072612d22c