diff --git a/lang/gcc/3.3/Makefile b/lang/gcc/3.3/Makefile
index 338be514f28..098ce15a94b 100644
--- a/lang/gcc/3.3/Makefile
+++ b/lang/gcc/3.3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2009/09/23 20:57:02 jasper Exp $
+# $OpenBSD: Makefile,v 1.39 2009/10/10 22:48:28 jasper Exp $
 
 ONLY_FOR_ARCHS=	alpha amd64 i386 m68k sparc sparc64 powerpc vax
 
@@ -12,7 +12,7 @@ PKGNAME-main=	gcc-${FULL_PKGVERSION}p14
 PKGNAME-c++ =	g++-${FULL_PKGVERSION}p12
 PKGNAME-estdc=	libstdc++-${FULL_PKGVERSION}p3
 PKGNAME-g77=	g77-${FULL_PKGVERSION}p11
-PKGNAME-java=	gcj-${FULL_PKGVERSION}p9
+PKGNAME-java=	gcj-${FULL_PKGVERSION}p10
 PKGNAME-objc=	gobjc-${FULL_PKGVERSION}p12
 PKGNAME-ada=	gnat-${FULL_PKGVERSION}p10
 SHARED_LIBS=	estdc++		6.0 \
diff --git a/lang/gcc/3.3/patches/patch-libffi_Makefile_in b/lang/gcc/3.3/patches/patch-libffi_Makefile_in
new file mode 100644
index 00000000000..0cabf64a5ca
--- /dev/null
+++ b/lang/gcc/3.3/patches/patch-libffi_Makefile_in
@@ -0,0 +1,32 @@
+$OpenBSD: patch-libffi_Makefile_in,v 1.1 2009/10/10 22:48:29 jasper Exp $
+
+Don't install libffi headers, gcj links statically with libffi.
+
+--- libffi/Makefile.in.orig	Tue Jan 28 02:44:57 2003
++++ libffi/Makefile.in	Sat Oct 10 11:11:00 2009
+@@ -651,19 +651,18 @@ install-info: install-info-recursive
+ all-recursive-am: fficonfig.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+-install-exec-am: install-toolexeclibLTLIBRARIES
+-install-exec: install-exec-recursive
++install-exec-am:
++install-exec:
+ 
+ install-data-am:
+-install-data: install-data-recursive
++install-data:
+ 
+-install-am: all-am
+-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-recursive
++install-am:
++install:
+ uninstall-am: uninstall-toolexeclibLTLIBRARIES
+ uninstall: uninstall-recursive
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) fficonfig.h
+-all-redirect: all-recursive-am
++all-redirect:
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs: installdirs-recursive
diff --git a/lang/gcc/3.3/patches/patch-libffi_include_Makefile_in b/lang/gcc/3.3/patches/patch-libffi_include_Makefile_in
new file mode 100644
index 00000000000..a1c53991d4a
--- /dev/null
+++ b/lang/gcc/3.3/patches/patch-libffi_include_Makefile_in
@@ -0,0 +1,23 @@
+$OpenBSD: patch-libffi_include_Makefile_in,v 1.1 2009/10/10 22:48:29 jasper Exp $
+
+Don't install libffi headers, gcj links statically with libffi.
+
+--- libffi/include/Makefile.in.orig	Sat Apr  5 03:46:50 2003
++++ libffi/include/Makefile.in	Sat Oct 10 11:12:30 2009
+@@ -168,12 +168,11 @@ installcheck: installcheck-am
+ install-exec-am:
+ install-exec: install-exec-am
+ 
+-install-data-am: install-hackDATA
+-install-data: install-data-am
++install-data-am:
++install-data:
+ 
+-install-am: all-am
+-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-am
++install-am:
++install:
+ uninstall-am: uninstall-hackDATA
+ uninstall: uninstall-am
+ all-am: Makefile $(DATA)
diff --git a/lang/gcc/3.3/pkg/PFRAG.PIC-java b/lang/gcc/3.3/pkg/PFRAG.PIC-java
index 419abe16c52..d98569f2447 100644
--- a/lang/gcc/3.3/pkg/PFRAG.PIC-java
+++ b/lang/gcc/3.3/pkg/PFRAG.PIC-java
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PFRAG.PIC-java,v 1.1.1.1 2005/01/03 15:21:30 espie Exp $
+@comment $OpenBSD: PFRAG.PIC-java,v 1.2 2009/10/10 22:48:29 jasper Exp $
 lib/fpic/lib-org-w3c-dom.a
 lib/fpic/lib-org-w3c-dom.la
 lib/fpic/lib-org-xml-sax.a
 lib/fpic/lib-org-xml-sax.la
-lib/fpic/libffi.a
-lib/fpic/libffi.la
+@comment lib/fpic/libffi.a
+@comment lib/fpic/libffi.la
diff --git a/lang/gcc/3.3/pkg/PFRAG.shared-java b/lang/gcc/3.3/pkg/PFRAG.shared-java
index f2912859221..58d1e424cfd 100644
--- a/lang/gcc/3.3/pkg/PFRAG.shared-java
+++ b/lang/gcc/3.3/pkg/PFRAG.shared-java
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PFRAG.shared-java,v 1.1.1.1 2005/01/03 15:21:30 espie Exp $
+@comment $OpenBSD: PFRAG.shared-java,v 1.2 2009/10/10 22:48:29 jasper Exp $
 @lib lib/lib-org-w3c-dom.so.0.0
 @lib lib/lib-org-xml-sax.so.0.0
-lib/libffi-2.00-beta.so
-lib/libffi.so
+@comment lib/libffi-2.00-beta.so
+@comment lib/libffi.so
 @comment @lib lib/libgc.so.1.2
 @lib lib/libgcj.so.4.0
diff --git a/lang/gcc/3.3/pkg/PLIST-java b/lang/gcc/3.3/pkg/PLIST-java
index 405b6995cab..e0c68eb7b3c 100644
--- a/lang/gcc/3.3/pkg/PLIST-java
+++ b/lang/gcc/3.3/pkg/PLIST-java
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PLIST-java,v 1.3 2009/09/23 20:57:02 jasper Exp $
+@comment $OpenBSD: PLIST-java,v 1.4 2009/10/10 22:48:29 jasper Exp $
 @conflict egcs-*-core
-@conflict libffi-*
 @pkgpath lang/egcs/stable,-java
 bin/${CONFIG}-egcj
 bin/eaddr2name.awk
@@ -14,9 +13,9 @@ bin/ejv-convert
 bin/ejv-scan
 bin/ermic
 bin/ermiregistry
-include/ffi.h
-include/ffi_mips.h
-include/fficonfig.h
+@comment include/ffi.h
+@comment include/ffi_mips.h
+@comment include/fficonfig.h
 @comment include/gc/
 @comment include/gc.h
 @comment include/gc/gc.h
@@ -1834,8 +1833,8 @@ lib/lib-org-w3c-dom.a
 lib/lib-org-w3c-dom.la
 lib/lib-org-xml-sax.a
 lib/lib-org-xml-sax.la
-lib/libffi.a
-lib/libffi.la
+@comment lib/libffi.a
+@comment lib/libffi.la
 @comment lib/libgc.a
 @comment lib/libgc.la
 lib/security/
diff --git a/lang/gcc/4.2/Makefile b/lang/gcc/4.2/Makefile
index 4f873955501..014ea2e5a92 100644
--- a/lang/gcc/4.2/Makefile
+++ b/lang/gcc/4.2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2009/09/23 20:57:02 jasper Exp $
+# $OpenBSD: Makefile,v 1.39 2009/10/10 22:48:29 jasper Exp $
 
 ONLY_FOR_ARCHS = alpha i386 m68k sparc sparc64 powerpc vax amd64
 #BROKEN=adjust for types changes
@@ -14,7 +14,7 @@ PKGNAME-c++ =   g++-${FULL_PKGVERSION}p5
 PKGNAME-estdc = libstdc++-${FULL_PKGVERSION}p3
 PKGNAME-g77 =   g77-${FULL_PKGVERSION}p0
 PKGNAME-f95 =   g95-${FULL_PKGVERSION}p2
-PKGNAME-java =  gcj-${FULL_PKGVERSION}p2
+PKGNAME-java =  gcj-${FULL_PKGVERSION}p3
 PKGNAME-objc =  gobjc-${FULL_PKGVERSION}p2
 PKGNAME-ada =   gnat-${FULL_PKGVERSION}p1
 SHARED_LIBS =	estdc++		11.0 \
diff --git a/lang/gcc/4.2/patches/patch-libffi_Makefile_in b/lang/gcc/4.2/patches/patch-libffi_Makefile_in
index 3e65ec0605f..7f7c99cbe9f 100644
--- a/lang/gcc/4.2/patches/patch-libffi_Makefile_in
+++ b/lang/gcc/4.2/patches/patch-libffi_Makefile_in
@@ -1,6 +1,9 @@
-$OpenBSD: patch-libffi_Makefile_in,v 1.1 2009/06/04 18:24:20 kurt Exp $
---- libffi/Makefile.in.orig	Tue Apr 21 17:37:05 2009
-+++ libffi/Makefile.in	Tue Apr 21 17:40:07 2009
+$OpenBSD: patch-libffi_Makefile_in,v 1.2 2009/10/10 22:48:29 jasper Exp $
+
+Don't install libffi headers, gcj links statically with libffi.
+
+--- libffi/Makefile.in.orig	Mon May 19 16:28:07 2008
++++ libffi/Makefile.in	Fri Oct  9 18:16:33 2009
 @@ -428,7 +428,8 @@ nodist_libffi_la_SOURCES = $(am__append_1) $(am__appen
  libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
  nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
@@ -11,3 +14,16 @@ $OpenBSD: patch-libffi_Makefile_in,v 1.1 2009/06/04 18:24:20 kurt Exp $
  AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
  AM_CCASFLAGS = $(AM_CPPFLAGS)
  all: fficonfig.h
+@@ -1203,9 +1204,9 @@ installdirs-am:
+ 	for dir in "$(DESTDIR)$(toolexeclibdir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+-install: install-recursive
+-install-exec: install-exec-recursive
+-install-data: install-data-recursive
++install:
++install-exec:
++install-data:
+ uninstall: uninstall-recursive
+ 
+ install-am: all-am
diff --git a/lang/gcc/4.2/patches/patch-libffi_include_Makefile_in b/lang/gcc/4.2/patches/patch-libffi_include_Makefile_in
new file mode 100644
index 00000000000..d5aa6845408
--- /dev/null
+++ b/lang/gcc/4.2/patches/patch-libffi_include_Makefile_in
@@ -0,0 +1,15 @@
+$OpenBSD: patch-libffi_include_Makefile_in,v 1.1 2009/10/10 22:48:29 jasper Exp $
+
+Don't install libffi headers, gcj links statically with libffi.
+
+--- libffi/include/Makefile.in.orig	Fri Oct  9 18:00:05 2009
++++ libffi/include/Makefile.in	Fri Oct  9 18:06:04 2009
+@@ -409,7 +409,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-toollibffiHEADERS
++install-data-am:
+ 
+ install-exec-am:
+ 
diff --git a/lang/gcc/4.2/pkg/PFRAG.PIC-java b/lang/gcc/4.2/pkg/PFRAG.PIC-java
index 317b28bd5b1..c509999e858 100644
--- a/lang/gcc/4.2/pkg/PFRAG.PIC-java
+++ b/lang/gcc/4.2/pkg/PFRAG.PIC-java
@@ -1,13 +1,10 @@
-@comment $OpenBSD: PFRAG.PIC-java,v 1.1 2009/06/04 18:24:20 kurt Exp $
+@comment $OpenBSD: PFRAG.PIC-java,v 1.2 2009/10/10 22:48:29 jasper Exp $
 lib/fpic/
 lib/fpic/gcj-${V}/
 @comment lib/fpic/gcj-${V}/classmap.db
 lib/fpic/gcj-${V}/libjvm.a
 lib/fpic/gcj-${V}/libjvm.la
 @comment lib/fpic/gcj-${V}/libjvm.so
-lib/fpic/libffi.a
-lib/fpic/libffi.la
-@comment @lib lib/fpic/libffi.so.${LIBffi_VERSION}
 lib/fpic/libgcj-tools.a
 lib/fpic/libgcj-tools.la
 @comment @lib lib/fpic/libgcj-tools.so.${LIBgcj-tools_VERSION}
diff --git a/lang/gcc/4.2/pkg/PFRAG.shared-java b/lang/gcc/4.2/pkg/PFRAG.shared-java
index 5224be849f8..561f71b8d3d 100644
--- a/lang/gcc/4.2/pkg/PFRAG.shared-java
+++ b/lang/gcc/4.2/pkg/PFRAG.shared-java
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PFRAG.shared-java,v 1.1 2009/06/04 18:24:20 kurt Exp $
+@comment $OpenBSD: PFRAG.shared-java,v 1.2 2009/10/10 22:48:29 jasper Exp $
 lib/gcj-${V}/libjvm.so
-@lib lib/libffi.so.${LIBffi_VERSION}
 @lib lib/libgcj-tools.so.${LIBgcj-tools_VERSION}
 @lib lib/libgcj.so.${LIBgcj_VERSION}
 @lib lib/libgij.so.${LIBgij_VERSION}
diff --git a/lang/gcc/4.2/pkg/PLIST-java b/lang/gcc/4.2/pkg/PLIST-java
index f8fb8469274..1ca0f7851fa 100644
--- a/lang/gcc/4.2/pkg/PLIST-java
+++ b/lang/gcc/4.2/pkg/PLIST-java
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST-java,v 1.2 2009/09/23 20:57:02 jasper Exp $
-@conflict libffi-*
+@comment $OpenBSD: PLIST-java,v 1.3 2009/10/10 22:48:29 jasper Exp $
 %%SHARED%%
+@bin bin/${CONFIG}-egcj
+@bin bin/${CONFIG}-egcjh
 bin/eaddr2name.awk
 @bin bin/egappletviewer
 @bin bin/egcj
@@ -16,8 +17,6 @@ bin/ejar
 @bin bin/ejcf-dump
 @bin bin/ejv-convert
 @bin bin/ejv-scan
-@bin bin/${CONFIG}-egcj
-@bin bin/${CONFIG}-egcjh
 include/c++/
 include/c++/${V}/
 include/c++/${V}/gcj/
@@ -3776,8 +3775,6 @@ lib/gcc/
 lib/gcc/${CONFIG}/
 lib/gcc/${CONFIG}/${V}/
 lib/gcc/${CONFIG}/${V}/include/
-lib/gcc/${CONFIG}/${V}/include/ffi.h
-lib/gcc/${CONFIG}/${V}/include/ffitarget.h
 lib/gcc/${CONFIG}/${V}/include/gcj/
 lib/gcc/${CONFIG}/${V}/include/gcj/libgcj-config.h
 lib/gcc/${CONFIG}/${V}/include/jawt.h
@@ -3789,8 +3786,6 @@ lib/gcj-${V}/
 lib/gcj-${V}/classmap.db
 lib/gcj-${V}/libjvm.a
 lib/gcj-${V}/libjvm.la
-lib/libffi.a
-lib/libffi.la
 lib/libgcj-tools.a
 lib/libgcj-tools.la
 lib/libgcj.a