diff -Nru libsbml-5.16.0+dfsg/debian/changelog libsbml-5.16.0+dfsg/debian/changelog
--- libsbml-5.16.0+dfsg/debian/changelog	2018-03-18 18:49:01.000000000 +0000
+++ libsbml-5.16.0+dfsg/debian/changelog	2018-06-29 14:30:49.000000000 +0000
@@ -1,3 +1,9 @@
+libsbml (5.16.0+dfsg-2+rpi1) buster-staging; urgency=medium
+
+  * Force build with openjdk 9 to hopefully fix documentation FTBFS.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 29 Jun 2018 14:30:49 +0000
+
 libsbml (5.16.0+dfsg-2) unstable; urgency=medium
 
   * Work around javadoc issue with Java 9
diff -Nru libsbml-5.16.0+dfsg/debian/control libsbml-5.16.0+dfsg/debian/control
--- libsbml-5.16.0+dfsg/debian/control	2018-03-18 18:49:01.000000000 +0000
+++ libsbml-5.16.0+dfsg/debian/control	2018-06-29 14:30:38.000000000 +0000
@@ -14,7 +14,7 @@
                python-dev,
                perl,
                libperl-dev,
-               default-jdk,
+               openjdk-9-jdk,
                dh-octave,
                r-base-dev,
                r-base-core,
@@ -26,6 +26,8 @@
                cli-common-dev,
                mono-runtime-common,
                texlive-latex-base
+Build-Conflicts:
+               openjdk-10-jre-headless
 Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libsbml.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/libsbml.git
diff -Nru libsbml-5.16.0+dfsg/debian/rules libsbml-5.16.0+dfsg/debian/rules
--- libsbml-5.16.0+dfsg/debian/rules	2018-03-18 18:49:01.000000000 +0000
+++ libsbml-5.16.0+dfsg/debian/rules	2018-06-29 14:30:49.000000000 +0000
@@ -3,6 +3,8 @@
 # debian/rules for libsbml
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DEB_BUILD_ARCH ?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+JVM_DIR :=java-9-openjdk-$(DEB_BUILD_ARCH)
 
 ### define the VARS ###
 version := $(shell dpkg-parsechangelog | grep Version | cut -d\  -f2 | cut -d- -f1)
@@ -56,7 +58,7 @@
 	cat debian/control.matlab >> debian/control || true
 endif
 	mkdir -p build
-	cd build ; cmake $(CMAKE_OPTS) ../
+	cd build ; cmake $(subst default-java,$(JVM_DIR),$(CMAKE_OPTS)) ../
 	# skip this hack since it should work also without it
 	# /bin/sh debian/bin/python_fix.sh