diff --git a/gitinspector.py b/gitinspector.py
index f0977f7..12b3e12 100755
--- a/gitinspector.py
+++ b/gitinspector.py
@@ -102,7 +102,9 @@ if __name__ == "__main__":
 			elif o in("-r", "--responsibilities"):
 				__run__.responsibilities = True
 			elif o in("--version"):
+				format.output_header()
 				format.call_output_function(version.output_html, version.output_text, version.output_xml)
+				format.output_footer()
 				sys.exit(0)
 			elif o in("--grading"):
 				__run__.include_metrics = True
diff --git a/version.py b/version.py
index effad2c..bc0abf6 100644
--- a/version.py
+++ b/version.py
@@ -34,7 +34,7 @@ def output_html(string, _):
 def output_text(_):
 	print("gitinspector {0}\n".format(__version__) + __doc__)
 
-def output_xml(_):
+def output_xml():
 	license_text = "\t\t" + __doc__.replace("\n", "\n\t\t")
-	print(string.format("\n\t<version>" + __version__ + "</version>\n" +
-	                    "\t<license-text>\n" + license_text + "\n\t</license-text>\n"))
+	print("\t<version>" + __version__ + "</version>\n" +
+	      "\t<license-text>\n" + license_text + "\n\t</license-text>")