diff --git a/pl-5.10.2-jpl-configure.patch b/pl-5.10.2-jpl-configure.patch
new file mode 100644
index 0000000..06d4e19
--- /dev/null
+++ b/pl-5.10.2-jpl-configure.patch
@@ -0,0 +1,85 @@
+--- a/packages/jpl/configure
++++ b/packages/jpl/configure
+@@ -4267,21 +4267,6 @@ fi
+ 
+ 
+ 
+-if test "x$JAVALIBS" = "x"; then
+-  case "$PLARCH" in
+-     *darwin*)
+-	  JAVALIBS="-Wl,-framework,JavaVM"
+-	  ;;
+-     *powerpc-linux*)
+-	  JAVALIBS="-ljava -ljvm"
+-	  ;;
+-     *)
+-	  JAVALIBS="-ljava -lverify -ljvm"
+-	  ;;
+-  esac
+-fi
+-
+-
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+   as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+@@ -5203,15 +5188,25 @@ case "$host_cpu" in
+ 		_JNI_LIBDIRS="lib/amd64"
+ 		_JNI_LIBSUBDIRS="server"
+ 		;;
++        alpha*)
++                _JNI_LIBDIRS="lib/alpha"
++                _JNI_LIBSUBDIRS="server"
++                ;;
+ 	powerpc)
+-		case "$host_os" in
+-		linux*)
+-			_JNI_LIBDIRS="lib/ppc bin"
+-			_JNI_LIBSUBDIRS="server classic"
+-			;;
+-		*)
+-			_JNI_LIBDIRS=""
+-		esac
++                _JNI_LIBDIRS="lib/ppc"
++                _JNI_LIBSUBDIRS="server"
++		;;
++	powerpc64)
++                _JNI_LIBDIRS="lib/ppc64"
++                _JNI_LIBSUBDIRS="server"
++		;;
++	s390)
++                _JNI_LIBDIRS="lib/s390"
++                _JNI_LIBSUBDIRS="server"
++		;;
++	s390x)
++                _JNI_LIBDIRS="lib/s390x"
++                _JNI_LIBSUBDIRS="server"
+ 		;;
+ 	*)
+ 		# Fallback option should work on all architectures except
+@@ -5220,6 +5215,26 @@ case "$host_cpu" in
+ 		_JNI_LIBSUBDIRS="server"
+ esac
+ 
++# Set JAVALIBS differently if we're using GCJ
++if test "x$JAVALIBS" = "x"; then
++    if (echo $_JTOPDIR | grep gcj > /dev/null); then
++        JAVALIBS="-ljvm"
++    else
++        case "$PLARCH" in
++            *darwin*)
++            JAVALIBS="-Wl,-framework,JavaVM"
++            ;;
++            *powerpc-linux*)
++            JAVALIBS="-ljava -ljvm"
++            ;;
++            *)
++            JAVALIBS="-ljava -lverify -ljvm"
++            ;;
++        esac
++    fi
++fi
++
++
+ for d in $_JNI_LIBDIRS; do
+ 	for subd in $_JNI_LIBSUBDIRS; do
+ 		echo "Trying $_JTOPDIR/jre/$d/$subd"
diff --git a/pl-5.7.11-jpl-configure.patch b/pl-5.7.11-jpl-configure.patch
deleted file mode 100644
index 845fb8b..0000000
--- a/pl-5.7.11-jpl-configure.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- pl-5.7.11/packages/jpl/configure.orig	2009-07-06 10:37:59.561560026 +0100
-+++ pl-5.7.11/packages/jpl/configure	2009-07-06 10:38:02.133810593 +0100
-@@ -3664,21 +3664,6 @@
-     CWFLAGS="${CWFLAGS-}"
- fi
- 
--if test "x$JAVALIBS" = "x"; then
--  case "$PLARCH" in
--     *darwin*)
--	  JAVALIBS="-Wl,-framework,JavaVM"
--	  ;;
--     *powerpc-linux*)
--	  JAVALIBS="-ljava -ljvm"
--	  ;;
--     *)
--	  JAVALIBS="-ljava -lverify -ljvm"
--	  ;;
--  esac
--fi
--
--
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-   { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-@@ -4638,15 +4623,25 @@
- 		_JNI_LIBDIRS="lib/amd64"
- 		_JNI_LIBSUBDIRS="server"
- 		;;
-+        alpha*)
-+                _JNI_LIBDIRS="lib/alpha"
-+                _JNI_LIBSUBDIRS="server"
-+                ;;
- 	powerpc)
--		case "$host_os" in
--		linux*)
--			_JNI_LIBDIRS="lib/ppc bin"
--			_JNI_LIBSUBDIRS="server classic"
--			;;
--		*)
--			_JNI_LIBDIRS=""
--		esac
-+                _JNI_LIBDIRS="lib/ppc"
-+                _JNI_LIBSUBDIRS="server"
-+		;;
-+	powerpc64)
-+                _JNI_LIBDIRS="lib/ppc64"
-+                _JNI_LIBSUBDIRS="server"
-+		;;
-+	s390)
-+                _JNI_LIBDIRS="lib/s390"
-+                _JNI_LIBSUBDIRS="server"
-+		;;
-+	s390x)
-+                _JNI_LIBDIRS="lib/s390x"
-+                _JNI_LIBSUBDIRS="server"
- 		;;
- 	*)
- 		# Fallback option should work on all architectures except
-@@ -4655,6 +4649,26 @@
- 		_JNI_LIBSUBDIRS="server"
- esac
- 
-+# Set JAVALIBS differently if we're using GCJ
-+if test "x$JAVALIBS" = "x"; then
-+    if (echo $_JTOPDIR | grep gcj > /dev/null); then
-+        JAVALIBS="-ljvm"
-+    else
-+        case "$PLARCH" in
-+            *darwin*)
-+            JAVALIBS="-Wl,-framework,JavaVM"
-+            ;;
-+            *powerpc-linux*)
-+            JAVALIBS="-ljava -ljvm"
-+            ;;
-+            *)
-+            JAVALIBS="-ljava -lverify -ljvm"
-+            ;;
-+        esac
-+    fi
-+fi
-+
-+
- for d in $_JNI_LIBDIRS; do
- 	for subd in $_JNI_LIBSUBDIRS; do
- 		echo "Trying $_JTOPDIR/jre/$d/$subd"
diff --git a/pl.spec b/pl.spec
index 9422f43..11fdbc2 100644
--- a/pl.spec
+++ b/pl.spec
@@ -22,7 +22,7 @@ URL:        http://www.swi-prolog.org
 Source:     http://www.swi-prolog.org/download/stable/src/%{name}-%{version}.tar.gz
 Source1:    http://www.swi-prolog.org/download/stable/doc/SWI-Prolog-%{version}.pdf
 #Source2:    http://www.swi-prolog.org/download/xpce/doc/userguide/userguide.html.tgz
-Patch1:     %{name}-5.7.11-jpl-configure.patch
+Patch1:     %{name}-5.10.2-jpl-configure.patch
 Patch2:     %{name}-5.7.11-man-files.patch
 Patch3:     %{name}-5.6.60-jni.patch
 Patch4:     %{name}-5.7.11-pc.patch
@@ -124,7 +124,7 @@ in Prolog.  In both setups it provides a reentrant bidirectional interface.
 
 %prep
 %setup -q
-#%patch1 -p1 -b .libjvm
+%patch1 -p1 -b .libjvm
 #%patch2 -p1 -b .man-files
 #%patch3 -p1 -b .jni
 #%patch4 -p1 -b .pc
@@ -299,6 +299,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Dec 09 2010 Petr Pisar <ppisar@redhat.com> - 5.10.2-1
 - 5.10.2 bump
 - Use DT_RUNPATH instead of pl-5.7.11-rpath.patch
+- Adjust jpl-configure.patch to 5.10.2
 
 * Wed Dec  8 2010 Petr Pisar <ppisar@redhar.com> - 5.7.11-6
 - Inhibit XPCE by macro to silent rpmlint