diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java
index 4987440436f..e674a156019 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java
@@ -944,7 +944,8 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
         String[] fmOptions = {
             "--module-path", "--system",
             "--class-path", "-classpath", "-cp",
-            "-bootclasspath"
+            "-bootclasspath",
+            "--multi-release"
         };
 
         for (String o: fmOptions) {
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties
index 5e0c53d64be..3af66f7c5ea 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/javap.properties
@@ -92,6 +92,9 @@ main.opt.system=\
 main.opt.module_path=\
 \  --module-path <path>             Specify where to find application modules
 
+main.opt.multi_release=\
+\  --multi-release <version>        Specify the version to use in multi-release JAR files
+
 main.opt.constants=\
 \  -constants                       Show final constants