diff --git a/CHANGES.current b/CHANGES.current
index bd591d430..2866a838f 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -7,6 +7,10 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
 Version 4.1.0 (in progress)
 ===========================
 
+2022-10-06: wsfulton
+            [Java] #Fix quoting for doxygen \image command to quote the output
+            file name generated into the html src attribute.
+
 2022-10-05: benjamin-sch
             [Python] added an interpreter counter to fix deinitialization
             issues if multiple subinterpreters are used
diff --git a/Examples/test-suite/doxygen_translate.i b/Examples/test-suite/doxygen_translate.i
index bb0af1c14..0d11a21d0 100644
--- a/Examples/test-suite/doxygen_translate.i
+++ b/Examples/test-suite/doxygen_translate.i
@@ -59,6 +59,7 @@
  * \endif
  * 
  * \image html testImage.bmp "Hello, world!" width=10cm
+ * \image html "test image.jpg" "Test jpeg" width=10cm
  * 
  * <ul>
  * 
diff --git a/Examples/test-suite/java/doxygen_translate_all_tags_runme.java b/Examples/test-suite/java/doxygen_translate_all_tags_runme.java
index 56272bf84..80087c65a 100644
--- a/Examples/test-suite/java/doxygen_translate_all_tags_runme.java
+++ b/Examples/test-suite/java/doxygen_translate_all_tags_runme.java
@@ -81,7 +81,7 @@ public class doxygen_translate_all_tags_runme {
     		" If not: SOMECONDITION {\n" +
     		" This is printed if not \n" +
     		" }\n" +
-    		" <img src=testImage.bmp alt=\"Hello, world!\" />\n" +
+    		" <img src=\"testImage.bmp\" alt=\"Hello, world!\"/>\n" +
     		" Some text \n" +
     		" describing invariant. \n");
     
diff --git a/Examples/test-suite/java/doxygen_translate_runme.java b/Examples/test-suite/java/doxygen_translate_runme.java
index b049a6466..c55c95150 100644
--- a/Examples/test-suite/java/doxygen_translate_runme.java
+++ b/Examples/test-suite/java/doxygen_translate_runme.java
@@ -69,7 +69,8 @@ public class doxygen_translate_runme {
     		" This is printed if not}\n" +
     		" \n" +
     		" \n" +
-    		" <img src=testImage.bmp alt=\"Hello, world!\"/>\n" +
+    		" <img src=\"testImage.bmp\" alt=\"Hello, world!\"/>\n" +
+    		" <img src=\"test image.jpg\" alt=\"Test jpeg\"/>\n" +
     		" \n" +
     		" <ul> \n" +
     		" \n" +
diff --git a/Examples/test-suite/python/doxygen_translate_runme.py b/Examples/test-suite/python/doxygen_translate_runme.py
index 38dca2ef9..a62df4a1d 100644
--- a/Examples/test-suite/python/doxygen_translate_runme.py
+++ b/Examples/test-suite/python/doxygen_translate_runme.py
@@ -58,6 +58,7 @@ If not: SOMECONDITION {
 }
 
 Image: testImage.bmp("Hello, world!")
+Image: "test image.jpg"("Test jpeg")
 
 
 
diff --git a/Source/Doxygen/javadoc.cxx b/Source/Doxygen/javadoc.cxx
index eafa57317..9f9f2e8e7 100644
--- a/Source/Doxygen/javadoc.cxx
+++ b/Source/Doxygen/javadoc.cxx
@@ -463,7 +463,11 @@ void JavaDocConverter::handleTagImage(DoxygenEntity &tag, std::string &translate
   if (it != tag.entityList.end())
     title = it->data;
 
-  translatedComment += "<img src=" + file;
+  translatedComment += "<img src=";
+  if (file.size() >= 2 && file[0] == '"' and file[file.size() - 1] == '"')
+    translatedComment += file;
+  else
+    translatedComment += "\"" + file + "\"";
   if (title.size())
     translatedComment += " alt=" + title;