diff --git a/dictionaries/admin.definition.json b/dictionaries/admin.definition.json
index f9e3b2097e3062711939c1ef1a753ae36bac05d2..c899f9b32647ec131c7143489638aa6b395e8140 100644
--- a/dictionaries/admin.definition.json
+++ b/dictionaries/admin.definition.json
@@ -83,6 +83,9 @@
 	"metaconv_title": {
 		"en": "Metadata parser"
 	},
+	"metaconv_selectfile": {
+		"en": "or select a file:"
+	},
 	"metaconv_parse": {
 		"en": "Parse"
 	},
diff --git a/templates/metadata-converter.php b/templates/metadata-converter.php
index ae95982b296d6c73dd3ac9135adb253d93a831da..6dd148c13289e62f7252b5d38d82e7c08c302034 100644
--- a/templates/metadata-converter.php
+++ b/templates/metadata-converter.php
@@ -7,12 +7,16 @@ $this->includeAtTemplateBase('includes/header.php');
 
 <h2><?php echo $this->t('metaconv_title'); ?></h2>
 
-<form action="?" method="post">
+<form action="?" method="post" enctype="multipart/form-data">
 
 <p><?php echo($this->t('{admin:metaconv_xmlmetadata}')); ?></p>
 <p>
 <textarea rows="20" cols="120" name="xmldata"><?php echo htmlspecialchars($this->data['xmldata']); ?></textarea>
 </p>
+<p>
+<?php echo $this->t('metaconv_selectfile'); ?>
+<input type="file" name="xmlfile" /></p>
+
 <p>
 <input type="submit" value="<?php echo $this->t('metaconv_parse'); ?>" />
 </p>
diff --git a/www/admin/metadata-converter.php b/www/admin/metadata-converter.php
index 828d2ce8db106960e8fba621415c5723ff0e842a..a7223745c372483d9ae95d3ed9d050e957f92cc1 100644
--- a/www/admin/metadata-converter.php
+++ b/www/admin/metadata-converter.php
@@ -7,9 +7,13 @@ SimpleSAML\Utils\Auth::requireAdmin();
 
 $config = SimpleSAML_Configuration::getInstance();
 
-if(array_key_exists('xmldata', $_POST)) {
+if ( !empty($_FILES['xmlfile']['tmp_name']) ) {
+	$xmldata = file_get_contents($_FILES['xmlfile']['tmp_name']);
+} elseif ( array_key_exists('xmldata', $_POST) ) {
 	$xmldata = $_POST['xmldata'];
+}
 
+if ( !empty($xmldata) ) {
 	\SimpleSAML\Utils\XML::checkSAMLMessage($xmldata, 'saml-meta');
 	$entities = SimpleSAML_Metadata_SAMLParser::parseDescriptorsString($xmldata);