diff -Nru commons-daemon-1.0.15/debian/changelog commons-daemon-1.0.15/debian/changelog
--- commons-daemon-1.0.15/debian/changelog	2022-05-02 04:07:56.000000000 +0000
+++ commons-daemon-1.0.15/debian/changelog	2022-07-10 03:37:07.000000000 +0000
@@ -1,3 +1,11 @@
+commons-daemon (1.0.15-10) unstable; urgency=medium
+
+  * Team upload.
+  * Correct patch for modern JVM detection (Closes: #935336)
+    Thank you to Chris Hofstaedtler.
+
+ -- tony mancill <tmancill@debian.org>  Sat, 09 Jul 2022 20:37:07 -0700
+
 commons-daemon (1.0.15-9) unstable; urgency=medium
 
   * Team upload.
diff -Nru commons-daemon-1.0.15/debian/patches/debian-935336.patch commons-daemon-1.0.15/debian/patches/debian-935336.patch
--- commons-daemon-1.0.15/debian/patches/debian-935336.patch	2022-05-02 04:07:56.000000000 +0000
+++ commons-daemon-1.0.15/debian/patches/debian-935336.patch	2022-07-10 03:37:07.000000000 +0000
@@ -1,10 +1,14 @@
 Description: locate more recent JVM (including OpenJDK)
-Author: Graeme Vetterlein <graeme.reportbug@vetterlein.com>
+Author: Graeme Vetterlein <graeme.reportbug@vetterlein.com>,
+        Chris Hofstaedtler <zeha@debian.org>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935336
+Last-Update: 2022-07-09
 
---- a/src/native/unix/native/location.c
-+++ b/src/native/unix/native/location.c
-@@ -115,6 +115,7 @@
+Index: commons-daemon-1.0.15/src/native/unix/native/location.c
+===================================================================
+--- commons-daemon-1.0.15.orig/src/native/unix/native/location.c
++++ commons-daemon-1.0.15/src/native/unix/native/location.c
+@@ -115,6 +115,7 @@ char *location_jvm_default[] = {
      "$JAVA_HOME/jre/lib/libjvm.so",
      "$JAVA_HOME/lib/classic/libjvm.so",
      "$JAVA_HOME/lib/client/libjvm.so",
@@ -12,3 +16,11 @@
      "$JAVA_HOME/lib/libjvm.so",
      "$JAVA_HOME/jre/bin/classic/libjvm.so",
      "$JAVA_HOME/jre/bin/client/libjvm.so",
+@@ -149,6 +150,7 @@ char *location_jvm_configured[] = {
+ #elif defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_BSD) || defined(OS_FREEBSD) || defined(OS_TRU64)
+     "$JAVA_HOME/jre/lib/" CPU "/$VM_NAME/libjvm.so",    /* Sun JDK 1.3 */
+     "$JAVA_HOME/lib/" CPU "/$VM_NAME/libjvm.so",        /* Sun JRE 1.3 */
++    "$JAVA_HOME/lib/$VM_NAME/libjvm.so",
+ #elif defined(OS_HPUX)
+     "$JAVA_HOME/jre/lib/" CPU "/$VM_NAME/libjvm." SO_EXT,
+     "$JAVA_HOME/lib/" CPU "/$VM_NAME/libjvm." SO_EXT,