diff --git a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
index 56d07ee1d..5b7be2324 100644
--- a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
+++ b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
@@ -1,42 +1,9 @@
+SUMMARY="GNU Java class library"
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language"
 HOMEPAGE="http://www.gnu.org/software/classpath"
 SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-0.98.tar.gz"
 REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND=""
 CHECKSUM_MD5="90c6571b8b0309e372faa0f9f6255ea9"
-BUILD()
-{
-	cd classpath-0.98
-	libtoolize --force --copy --install
-	aclocal -I m4
-	autoconf
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--mandir=$COMMON_DOCS/man \
-		--infodir=$COMMON_DOCS/info \
-		--disable-gtk-peer \
-		--disable-alsa \
-		--disable-plugin \
-		--disable-gconf-peer \
-		--disable-gjdoc \
-		LDFLAGS="-lnetwork"
-	make
-}
-
-INSTALL()
-{
-	cd classpath-0.98
-	make install
-}
-
-TEST()
-{
-	cd classpath-0.98
-#	make test
-#	make check
-}
-
 LICENSE="GNU GPL v2
 	GNU GPL v2 with classpath exceptions"
 COPYRIGHT="1998-1999, 2001-2008 Free Software Foundation
@@ -48,3 +15,56 @@ COPYRIGHT="1998-1999, 2001-2008 Free Software Foundation
 	2004 World Wide Web Consortium
 	2005 Caolan McNamara
 	2005 Daniel Richard G."
+	
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+PROVIDES="
+	gnu_classpath = $portVersion
+"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:libtoolize
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	# at least one java VM, for now just use jamvm
+	cmd:jamvm$secondaryArchSuffix
+"
+
+SOURCE_DIR="classpath-0.98"
+
+PATCHES="gnu_classpath-0.98.patch"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal -I m4
+	autoconf
+	runConfigure ./configure \
+		--disable-gtk-peer \
+		--disable-alsa \
+		--disable-plugin \
+		--disable-gconf-peer \
+		--disable-gjdoc \
+		LDFLAGS="-lnetwork"
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	:
+#	make test
+#	make check
+}