--- fop
+++ fop
@@ -137,7 +137,8 @@
   fi
 fi
 
-if [ ! -x "$JAVACMD" ] ; then
+# bnc#467866 fop fails if JAVACMD_OPTS is set
+if [ ! -x "`echo $JAVACMD | cut -d ' ' -f 1`" ] ; then
   echo "Error: JAVA_HOME is not defined correctly."
   echo "  We cannot execute $JAVACMD"
   exit 1
@@ -247,7 +248,7 @@
 
 # Execute FOP using eval/exec to preserve spaces in paths,
 # java options, and FOP args
-fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
+fop_exec_command="exec $JAVACMD $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
 if $fop_exec_debug ; then
     echo $fop_exec_command
 fi