diff --git a/.cvsignore b/.cvsignore
index 951a2d9..f798efe 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-pl-5.6.50.tar.gz
+pl-5.6.52.tar.gz
 HTMLmanual.tar.gz
 userguide.html.tgz
diff --git a/pl-5.6.52-fix-java-directory.patch b/pl-5.6.52-fix-java-directory.patch
new file mode 100644
index 0000000..1cf514a
--- /dev/null
+++ b/pl-5.6.52-fix-java-directory.patch
@@ -0,0 +1,23 @@
+--- pl-5.6.52/packages/jpl/configure.orig	2008-03-31 14:49:28.000000000 +0200
++++ pl-5.6.52/packages/jpl/configure	2008-03-31 15:29:02.000000000 +0200
+@@ -4629,14 +4629,12 @@
+ 		_JNI_LIBSUBDIR="server"
+ 		;;
+ 	powerpc)
+-		case "$host_os" in
+-		linux*)
+-			_JNI_LIBDIRS="bin"
+-			_JNI_LIBSUBDIR="classic"
+-			;;
+-		*)
+-			_JNI_LIBDIRS=""
+-		esac
++		_JNI_LIBDIRS="lib/ppc"
++		_JNI_LIBSUBDIR="core"
++		;;
++	powerpc64)
++		_JNI_LIBDIRS="lib/ppc64"
++		_JNI_LIBSUBDIR="core"
+ 		;;
+ 	*)
+ 		_JNI_LIBDIRS=""
diff --git a/pl.spec b/pl.spec
index 86e4c78..d6c2dd3 100644
--- a/pl.spec
+++ b/pl.spec
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.50
+Version:	5.6.52
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -12,6 +12,7 @@ Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTM
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         pl-5.4.6-rpath.patch
 Patch1:         pl-5.6.0-multilib.patch
+Patch2:         pl-5.6.52-fix-java-directory.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gmp-devel
 BuildRequires:  libICE-devel
@@ -31,9 +32,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
 BuildRequires:  unixODBC-devel
 BuildRequires:  freetype-devel
-%ifnarch ppc64 ppc
-BuildRequires: java-devel-icedtea
-%endif
+BuildRequires:  java-devel-openjdk
 Requires:       readline-devel
 
 %description
@@ -45,44 +44,38 @@ XML/SGML), sgml/RDF (reading RDF into triples) and XPCE (Graphics UI
 toolkit, integrated editor (Emacs-clone) and source-level debugger).
 
 
-%ifnarch ppc64 ppc
 %package jpl
 Summary: A bidirectional Prolog/Java interface for SWI Prolog
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
-Requires: java-icedtea
+Requires: java-sdk-openjdk
 
 %description jpl
 JPL is a library using the SWI-Prolog foreign interface and the Java jni
 interface providing a bidirectional interface between Java and Prolog
 that can be used to embed Prolog in Java as well as for embedding Java
-in Prolog.  In both setups it provides a reentrant bidirectional interface
-%endif
+in Prolog.  In both setups it provides a reentrant bidirectional interface.
 
 
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .multilib
+%patch2 -p1 -b .libjvm
 (
    mkdir doc-install
    cd doc-install
    tar zxf %{SOURCE1}
    tar zxf %{SOURCE2}
 )
-find . -name CVS | xargs rm -fr
 
 
 %build
-%configure
+%configure --enable-shared
 make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 PATH=$PWD/src:$PATH
 cd packages
-%ifarch ppc64 ppc
-%configure --without-jpl
-%else
 %configure
-%endif
 make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 cd ..
 
@@ -122,17 +115,24 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/pl-%{version}/lib/*/libjpl.so
 %exclude %{_libdir}/pl-%{version}/lib/jpl.jar
 
-%ifnarch ppc64 ppc
 %files jpl
 %doc packages/jpl/docs/*
 %{_libdir}/pl-%{version}/library/jpl.pl
 %{_libdir}/pl-%{version}/lib/*/libjpl.so
 %{_libdir}/pl-%{version}/lib/jpl.jar
-%endif
 
 
 %changelog
-* Fri Feb 22 2008 Mary Ellen foster <mefoster at gmail.com> - 5.6.50-1
+* Mon Mar 31 2008 Mary Ellen Foster <mefoster at gmail.com> - 5.6.52-1
+- Switch jpl requirement from IcedTea to OpenJDK and enable it everywhere
+- Upgrade to 5.6.52
+- Patch jpl configure script to find Java libraries on ppc{64}
+- NB: Still broken on ppc64, still trying to figure out why
+
+* Mon Feb 25 2008 Mary Ellen Foster <mefoster at gmail.com> - 5.6.51-1
+- Upgrade to 5.6.51
+
+* Fri Feb 22 2008 Mary Ellen Foster <mefoster at gmail.com> - 5.6.50-1
 - Update to 5.6.50
 - Enable JPL (as a sub-package) -- NB: it only builds with icedtea for now,
   so we disable that sub-package on ppc64 and ppc for the moment
diff --git a/sources b/sources
index 6066d90..764a7cb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-55dddf131ef9184f4272e9357c264d43  pl-5.6.50.tar.gz
-4fba0fc6cf9fea14d8536d65446046f4  HTMLmanual.tar.gz
+3b15a61d4e395cf85118ecb8905b245e  pl-5.6.52.tar.gz
+100d98b2339e250353876dcfaec0ff49  HTMLmanual.tar.gz
 a4462019611caa4f69247c8bf94404a7  userguide.html.tgz