diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index 8072416f2467..3d087be55f49 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -15,6 +15,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GNU project to create free core class libraries
 
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+
 USE_GNOME=	gtk20 libartlgpl2 pkgconfig
 USE_JAVA=	yes
 USE_JIKES=	yes
@@ -26,10 +28,6 @@ PLIST_FILES=	lib/security/classpath.security
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Configure fails on FreeBSD >= 5.x"
-.endif
-
 post-install:
 .for dir in ${PREFIX}/share/classpath ${PREFIX}/lib/classpath
 	@${FIND} ${dir} ! -type d | \
diff --git a/java/classpath/files/patch-native::jni::gtk-peer::gthread-jni.c b/java/classpath/files/patch-native::jni::gtk-peer::gthread-jni.c
new file mode 100644
index 000000000000..103979ff3a17
--- /dev/null
+++ b/java/classpath/files/patch-native::jni::gtk-peer::gthread-jni.c
@@ -0,0 +1,14 @@
+--- native/jni/gtk-peer/gthread-jni.c.orig	Mon Oct 25 15:42:21 2004
++++ native/jni/gtk-peer/gthread-jni.c	Mon Oct 25 15:45:31 2004
+@@ -218,7 +218,11 @@
+ /* Global data				     				*/
+ /************************************************************************/
+ 
++#if __FreeBSD_version < 500000
++#include <inttypes.h>
++#else
+ #include <stdint.h>		/* provides intptr_t */
++#endif
+ #include <stdarg.h>		/* va_list */
+ #include "gthread-jni.h"
+ #include <assert.h>		/* assert() */