diff --git a/debian/ant.properties b/debian/ant.properties
index 7385c7f..b2a42ad 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,2 +1,2 @@
-ant.build.javac.source=1.5
-ant.build.javac.target=1.5
+ant.build.javac.source=1.6
+ant.build.javac.target=1.6
diff --git a/debian/changelog b/debian/changelog
index 474ea88..ac48c65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libtritonus-java (20070428-14.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Peter Michael Green ]
+ * Bump java source/binary versions to 1.6, since unstable's compiler
+ no longer accepts 1.5
+ * Fix build with new fluidsynth. (Closes: #946916)
+ * Bump fluidsynth build-dependency.
+
+ -- Sebastian Ramacher <sramacher@debian.org> Mon, 27 Jan 2020 00:28:23 +0100
+
libtritonus-java (20070428-14) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index ec4bf0d..6955fea 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
default-jdk,
libasound2-dev | libasound-dev,
libcdparanoia-dev,
- libfluidsynth-dev,
+ libfluidsynth-dev (>= 2),
libjlayer-java,
libjorbis-java,
libogg-dev,
diff --git a/debian/patches/bump-java-to-1.6.patch b/debian/patches/bump-java-to-1.6.patch
new file mode 100644
index 0000000..a924708
--- /dev/null
+++ b/debian/patches/bump-java-to-1.6.patch
@@ -0,0 +1,54 @@
+Description: Bump java source/binary versions to 1.6, since unstable's compiler no longer accepts 1.5
+ Note: the java version is also mentioned in debian/ant.properties, I don't know
+ which one takes precedence.
+Author: Peter Michael Green <plugwash@debian.org>
+
+--- libtritonus-java-20070428.orig/build-common.xml
++++ libtritonus-java-20070428/build-common.xml
+@@ -15,7 +15,7 @@
+ <property name="src.classes" value="${src}/classes" />
+ <property name="src.misc" value="${src}/misc" />
+ <property name="debug" value="on"/>
+- <property name="source" value="1.5"/>
++ <property name="source" value="1.6"/>
+ <available
+ classname="grame.midishare.Midi"
+ property="midishare-present" />
+@@ -404,7 +404,7 @@
+ Windowtitle="Tritonus API"
+ link="http://java.sun.com/j2se/1.5.0/docs/api/"
+ use="true"
+- source="1.5"
++ source="1.6"
+ additionalparam="-breakiterator">
+ </javadoc>
+ <!-- additionalparam="-breakiterator" -->
+@@ -416,7 +416,7 @@
+ package="true" sourcepath="${src}" destdir="${javadoc.dir}"
+ packagenames="javax.sound.*"
+ Windowtitle="Java Sound API"
+- source="1.5"
++ source="1.6"
+ additionalparam="-breakiterator">
+ </javadoc>
+ <!-- additionalparam="-breakiterator" -->
+--- libtritonus-java-20070428.orig/test/suite/build.xml
++++ libtritonus-java-20070428/test/suite/build.xml
+@@ -45,7 +45,7 @@
+ <target name="compile-api" depends="prepare">
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+- source="1.5"
++ source="1.6"
+ debug="on">
+ <compilerarg value="-Xlint:unchecked"/>
+ <exclude name="org/tritonus/test/*.java"/>
+@@ -59,7 +59,7 @@
+ <target name="compile-tritonus" depends="prepare, init-tritonus">
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+- source="1.5"
++ source="1.6"
+ debug="on">
+ <exclude name="org/tritonus/test/api/"/>
+ <classpath refid="compile.classpath"/>
diff --git a/debian/patches/fluidsynth2.patch b/debian/patches/fluidsynth2.patch
new file mode 100644
index 0000000..a445776
--- /dev/null
+++ b/debian/patches/fluidsynth2.patch
@@ -0,0 +1,54 @@
+Description: Fix build with new fluidsynth.
+Author: Peter Michael Green <plugwash@debian.org>
+
+--- libtritonus-java-20070428.orig/src/lib/fluidsynth/org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c
++++ libtritonus-java-20070428/src/lib/fluidsynth/org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c
+@@ -282,7 +282,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_
+ jobject instrument;
+
+ fluid_sfont_t* sfont;
+- fluid_preset_t preset;
++ fluid_preset_t* preset;
+ int offset;
+ int i = 0;
+ fluid_synth_t* synth;
+@@ -313,9 +313,9 @@ JNIEXPORT jobjectArray JNICALL Java_org_
+
+ if (sfont != NULL)
+ {
+- sfont->iteration_start(sfont);
++ fluid_sfont_iteration_start(sfont);
+
+- while (sfont->iteration_next(sfont, &preset))
++ while ((preset = fluid_sfont_iteration_next(sfont)))
+ {
+ count++;
+ }
+@@ -330,19 +330,19 @@ JNIEXPORT jobjectArray JNICALL Java_org_
+ if (sfont == NULL)
+ return 0;
+
+- sfont->iteration_start(sfont);
++ fluid_sfont_iteration_start(sfont);
+
+- while (sfont->iteration_next(sfont, &preset))
++ while ((preset = fluid_sfont_iteration_next(sfont)))
+ {
+ instrname = (*env)->NewStringUTF(env,
+- // fluid_preset_get_name(&preset)
+- preset.get_name(&preset)
++ fluid_preset_get_name(preset)
++ // preset.get_name(&preset)
+ );
+ instrument = (*env)->NewObject(env, fluidinstrclass, initid, obj,
+- // (jint) fluid_preset_get_banknum(&preset) + offset,
+- (jint) (preset.get_banknum(&preset) + offset),
+- // (jint) fluid_preset_get_num(&preset),
+- (jint) (preset.get_num(&preset)),
++ (jint) fluid_preset_get_banknum(preset) + offset,
++ // (jint) (preset.get_banknum(&preset) + offset),
++ (jint) fluid_preset_get_num(preset),
++ // (jint) (preset.get_num(&preset)),
+ (jobject) instrname);
+ (*env)->SetObjectArrayElement(env, instruments, i++, instrument);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 82a22e5..a3c41d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@ dfsg.diff
alsa-1.0.16.diff
ignore-ant-dtd.diff
java10-compatibility.diff
+bump-java-to-1.6.patch
+fluidsynth2.patch
