diff --git a/CHANGES.current b/CHANGES.current
index 2614bf6d7..f5ffd91e2 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -7,6 +7,12 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
 Version 4.1.0 (in progress)
 ===========================
 
+2022-07-07: olly
+	    [xml] #2213 XML has been moved to "Experimental" target language
+	    status. It's not in good shape and is likely to be removed unless
+	    somebody steps up to bring it up to the expected standard (it fails
+	    to even meet the criteria for "Experimental" currently).
+
 2022-07-07: jmarrec
 	    #1158 #2286 Add basic support for C++11 attributes.  These are now
 	    crudely ignored by SWIG's parser's tokeniser, which is better that
diff --git a/Doc/Manual/SWIG.html b/Doc/Manual/SWIG.html
index 1d929ac71..8d8f7bd45 100644
--- a/Doc/Manual/SWIG.html
+++ b/Doc/Manual/SWIG.html
@@ -134,11 +134,11 @@ Supported Target Language Options
      -ruby           - Generate Ruby wrappers
      -scilab         - Generate Scilab wrappers
      -tcl8           - Generate Tcl 8 wrappers
-     -xml            - Generate XML wrappers
 
 Experimental Target Language Options
      -mzscheme       - Generate MzScheme/Racket wrappers
      -ocaml          - Generate OCaml wrappers
+     -xml            - Generate XML wrappers
 
 General Options
      -addextern      - Add extra extern declarations
diff --git a/Examples/xml/Makefile.in b/Examples/xml/Makefile.in
index 44894b8ea..eaabe0ac5 100644
--- a/Examples/xml/Makefile.in
+++ b/Examples/xml/Makefile.in
@@ -5,9 +5,11 @@ top_srcdir	= @top_srcdir@
 top_builddir	= @top_builddir@
 
 SWIGEXE         = $(top_builddir)/swig
+# Suppress "experimental target language" warning
+SWIGOPT         = -w524
 SWIG_LIB_DIR    = $(top_srcdir)/Lib
 SWIG_LIB_SET    = @SWIG_LIB_SET@
-SWIGINVOKE      = $(SWIG_LIB_SET) $(SWIGTOOL) $(SWIGEXE)
+SWIGINVOKE      = $(SWIG_LIB_SET) $(SWIGTOOL) $(SWIGEXE) $(SWIGOPT)
 
 cleanup		= tail +2 \
 		  | sed -e 's/ident="ID[0-9A-F]*"//g' \
diff --git a/RELEASENOTES b/RELEASENOTES
index 1fedffc8a..2fad03096 100644
--- a/RELEASENOTES
+++ b/RELEASENOTES
@@ -14,6 +14,7 @@ SWIG-4.1.0 summary:
 - Common cases of `<` and `>` comparisons in constant expressions are now
   supported.
 - GitHub Actions is now used instead of Travis CI for continuous integration.
+- The "XML" target language has been reclassified as "Experimental".
 
 SWIG-4.0.2 summary:
 - A few fixes around doxygen comment handling.
diff --git a/Source/Modules/swigmain.cxx b/Source/Modules/swigmain.cxx
index 45dffbe85..7cb2c2398 100644
--- a/Source/Modules/swigmain.cxx
+++ b/Source/Modules/swigmain.cxx
@@ -80,7 +80,7 @@ static TargetLanguageModule modules[] = {
   {"-tcl", swig_tcl, NULL, Supported},
   {"-tcl8", swig_tcl, "Tcl 8", Supported},
   {"-uffi", NULL, "Common Lisp / UFFI", Disabled},
-  {"-xml", swig_xml, "XML", Supported},
+  {"-xml", swig_xml, "XML", Experimental},
   {NULL, NULL, NULL, Disabled}
 };