diff --git a/autotest/XmlCharset/0.xml b/autotest/XmlCharset/0.xml
new file mode 100644
index 000000000..f85bc046d
--- /dev/null
+++ b/autotest/XmlCharset/0.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test>
+	<tag attr="Nějaký šikovný attribut">
+		Úplně nevinný tag
+	</tag>
+</test>
diff --git a/autotest/XmlCharset/1.xml b/autotest/XmlCharset/1.xml
new file mode 100644
index 000000000..3de7895b4
--- /dev/null
+++ b/autotest/XmlCharset/1.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="windows 1250"?>
+<test>
+	<tag attr="Nìjaký šikovný attribut">
+		Úplnì nevinný tag
+	</tag>
+</test>
diff --git a/autotest/XmlCharset/XmlCharset.cpp b/autotest/XmlCharset/XmlCharset.cpp
new file mode 100644
index 000000000..1df48858f
--- /dev/null
+++ b/autotest/XmlCharset/XmlCharset.cpp
@@ -0,0 +1,10 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	XmlNode xml = ParseXML(LoadFile(GetDataFile("1.xml")));
+	DDUMP(xml["test"]["tag"].GatherText());
+	DDUMP(xml["test"]["tag"].Attr(0));
+}
diff --git a/autotest/XmlCharset/XmlCharset.upp b/autotest/XmlCharset/XmlCharset.upp
new file mode 100644
index 000000000..e4c3f3a6a
--- /dev/null
+++ b/autotest/XmlCharset/XmlCharset.upp
@@ -0,0 +1,11 @@
+uses
+	Core;
+
+file
+	XmlCharset.cpp,
+	0.xml,
+	1.xml charset "windows-1250";
+
+mainconfig
+	"" = "";
+