diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index aa4da87bd7af..d8ddcc8c799e 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -49,7 +49,7 @@ MAKE_JOBS_SAFE=	yes
 
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	freebsd bsdjava
+JAVA_VENDOR=	freebsd bsdjava openjdk
 .if (${OSVERSION} >= 700000)
 JAVA_VERSION=	1.5 1.6
 .else
diff --git a/editors/openoffice.org-2-RC/files/patch-i103628 b/editors/openoffice.org-2-RC/files/patch-i103628
new file mode 100644
index 000000000000..c3846bc27ae2
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i103628
@@ -0,0 +1,26 @@
+very strange workaround indeed.
+
+--- qadevOOo/runner/makefile.mk	2009-07-04 12:13:19.000000000 +0900
++++ qadevOOo/runner/makefile.mk	2009-07-19 09:37:44.000000000 +0900
+@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co
+ 
+ JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
+ JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
++JAR=${JAVA_HOME}/bin/jar
+ 
+ # --- Targets ------------------------------------------------------
+ .IF "$(SOLAR_JAVA)"=="TRUE"
+@@ -52,11 +53,11 @@ OWNJAR: ALLTAR
+ 
+ # LLA: parameter v is only verbose, need too long!
+ OWNJAR: LIGHT
+-    jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
++    ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+ 
+ # LLA: parameter v is only verbose, need too long!
+ LIGHT:
+-    jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
++    ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+ 
+ .ELSE
+ all:
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index c33015c21c98..9141d8ea24ac 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -49,7 +49,7 @@ MAKE_JOBS_SAFE=	yes
 
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	freebsd bsdjava
+JAVA_VENDOR=	freebsd bsdjava openjdk
 .if (${OSVERSION} >= 700000)
 JAVA_VERSION=	1.5 1.6
 .else
diff --git a/editors/openoffice.org-2-devel/files/patch-i103628 b/editors/openoffice.org-2-devel/files/patch-i103628
new file mode 100644
index 000000000000..c3846bc27ae2
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i103628
@@ -0,0 +1,26 @@
+very strange workaround indeed.
+
+--- qadevOOo/runner/makefile.mk	2009-07-04 12:13:19.000000000 +0900
++++ qadevOOo/runner/makefile.mk	2009-07-19 09:37:44.000000000 +0900
+@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co
+ 
+ JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
+ JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
++JAR=${JAVA_HOME}/bin/jar
+ 
+ # --- Targets ------------------------------------------------------
+ .IF "$(SOLAR_JAVA)"=="TRUE"
+@@ -52,11 +53,11 @@ OWNJAR: ALLTAR
+ 
+ # LLA: parameter v is only verbose, need too long!
+ OWNJAR: LIGHT
+-    jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
++    ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+ 
+ # LLA: parameter v is only verbose, need too long!
+ LIGHT:
+-    jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
++    ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+ 
+ .ELSE
+ all:
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 4e6ff9e87f63..40e3e92be52c 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -48,7 +48,7 @@ MAKE_JOBS_SAFE=	yes
 
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	freebsd bsdjava
+JAVA_VENDOR=	freebsd bsdjava openjdk
 .if (${OSVERSION} >= 700000)
 JAVA_VERSION=	1.5 1.6
 .else
diff --git a/editors/openoffice.org-2/files/patch-i103628 b/editors/openoffice.org-2/files/patch-i103628
new file mode 100644
index 000000000000..c3846bc27ae2
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i103628
@@ -0,0 +1,26 @@
+very strange workaround indeed.
+
+--- qadevOOo/runner/makefile.mk	2009-07-04 12:13:19.000000000 +0900
++++ qadevOOo/runner/makefile.mk	2009-07-19 09:37:44.000000000 +0900
+@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co
+ 
+ JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
+ JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
++JAR=${JAVA_HOME}/bin/jar
+ 
+ # --- Targets ------------------------------------------------------
+ .IF "$(SOLAR_JAVA)"=="TRUE"
+@@ -52,11 +53,11 @@ OWNJAR: ALLTAR
+ 
+ # LLA: parameter v is only verbose, need too long!
+ OWNJAR: LIGHT
+-    jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
++    ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+ 
+ # LLA: parameter v is only verbose, need too long!
+ LIGHT:
+-    jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
++    ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+ 
+ .ELSE
+ all:
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index c33015c21c98..9141d8ea24ac 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -49,7 +49,7 @@ MAKE_JOBS_SAFE=	yes
 
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	freebsd bsdjava
+JAVA_VENDOR=	freebsd bsdjava openjdk
 .if (${OSVERSION} >= 700000)
 JAVA_VERSION=	1.5 1.6
 .else
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i103628 b/editors/openoffice.org-vcltesttool/files/patch-i103628
new file mode 100644
index 000000000000..c3846bc27ae2
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i103628
@@ -0,0 +1,26 @@
+very strange workaround indeed.
+
+--- qadevOOo/runner/makefile.mk	2009-07-04 12:13:19.000000000 +0900
++++ qadevOOo/runner/makefile.mk	2009-07-19 09:37:44.000000000 +0900
+@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co
+ 
+ JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
+ JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
++JAR=${JAVA_HOME}/bin/jar
+ 
+ # --- Targets ------------------------------------------------------
+ .IF "$(SOLAR_JAVA)"=="TRUE"
+@@ -52,11 +53,11 @@ OWNJAR: ALLTAR
+ 
+ # LLA: parameter v is only verbose, need too long!
+ OWNJAR: LIGHT
+-    jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
++    ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+ 
+ # LLA: parameter v is only verbose, need too long!
+ LIGHT:
+-    jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
++    ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+ 
+ .ELSE
+ all: