diff --git a/mod/glossary/export.php b/mod/glossary/export.php
index cff6cf31688..b8bc8905934 100644
--- a/mod/glossary/export.php
+++ b/mod/glossary/export.php
@@ -66,7 +66,7 @@
     glossary_generate_export_file($glossary,$lastl,$lastcat);
     print_string("glosssaryexported","glossary");
 
-    $ffurl = "/$course->id/glossary/" . clean_filename($glossary->name) ."/glossary.xml";
+    $ffurl = "/$course->id/glossary/" . clean_filename(strip_tags($glossary->name)) ."/glossary.xml";
     if ($CFG->slasharguments) {
         $ffurl = "../../file.php$ffurl" ;
     } else {
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 266b2fb3467..f3e0da2846e 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -1587,7 +1587,7 @@ function glossary_open_xml($glossary) {
 
         //Open for writing
 
-        $file = $CFG->dataroot."/$glossary->course/glossary/". clean_filename($glossary->name) ."/glossary.xml";
+        $file = $CFG->dataroot."/$glossary->course/glossary/". clean_filename(strip_tags($glossary->name)) ."/glossary.xml";
         $h = fopen($file,"w");
         //Writes the header
         $status = fwrite ($h,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");