diff --git a/makefile b/makefile
index 7076fe85825e626a9a2fc098b04dcfefaa362b7a..4fef7f1c75406ad6d2d4d186ed8f0da98aec5bdc 100644
--- a/makefile
+++ b/makefile
@@ -113,6 +113,7 @@ debug build-debug:
 	    cp $$dir/bin-debug/* $(addsuffix -debug, $(BINFOLDER)); \
 	done
 	cp translateAddresses $(addsuffix -debug, $(BINFOLDER)); \
+	cp xmlFormat $(addsuffix -debug, $(BINFOLDER)); \
 	if [ "$@" == "debug" ] && [ $(RUN_TESTS) -eq 1 ]; then for test in $(wildcard tests.*.sh); do \
 		./$$test debug $(JOBS); \
 	done; fi
@@ -140,6 +141,7 @@ release build-release:
 	    cp $$dir/bin-release/* $(addsuffix -release, $(BINFOLDER)); \
 	done
 	cp translateAddresses $(addsuffix -release, $(BINFOLDER)); \
+	cp xmlFormat $(addsuffix -release, $(BINFOLDER)); \
 	if [ "$@" == "release" ] && [ $(RUN_TESTS) -eq 1 ]; then for test in $(wildcard tests.*.sh); do \
 		./$$test release $(JOBS); \
 	done; fi
diff --git a/xmlFormat b/xmlFormat
new file mode 100755
index 0000000000000000000000000000000000000000..7c506e6fa3ae79f1863774db127b87957a6e9f2e
--- /dev/null
+++ b/xmlFormat
@@ -0,0 +1,8 @@
+#! /bin/bash
+
+TMPFILE=$(mktemp)
+for i in "$@"
+do
+	cp "$i" "$TMPFILE"
+	xmllint --format "$TMPFILE" > "$i"
+done