diff --git a/tools/glossary2rst.py b/tools/glossary2rst.py
index f014086337..7d87a9cc8e 100755
--- a/tools/glossary2rst.py
+++ b/tools/glossary2rst.py
@@ -24,13 +24,13 @@ KNOWN_TAGS = [
     'code',
     'command',
     'filename',
-    'link',
-    'literal',
     'glossary',
     'glossdef',
     'glossdiv',
     'glossentry',
     'glossterm',
+    'link',
+    'literal',
     'para',
     'phrase',
     'systemitem',
@@ -118,9 +118,9 @@ def convert(element):
     if tag == "command":
         return ":command:`%s`" % element.text
     if tag == "code":
-        return "`%s`" % element.text
+        return "``%s``" % element.text
     if tag == "filename":
-        return ":file:`%s`" % element.text
+        return "``%s``" % element.text
     if tag == "glossary":
         return concat(element)
     if tag == "glossdiv":
@@ -130,7 +130,7 @@ def convert(element):
     if tag == "link":
         return link(element)
     if tag == "literal":
-        return "`%s`" % element.text
+        return "``%s``" % element.text
     if tag == "para":
         return "\n\n" + concat(element)
     if tag == "phrase":
@@ -160,7 +160,7 @@ def glossary_convert(filename):
     rstcontent = rst_convert(doc.getroot()).encode('utf-8')
     heading = "========\n" + "Glossary\n" + "========\n\n"
     heading += ".. comments\n"
-    heading += "   This file file is automatically generated, edit the master"
+    heading += "   This file is automatically generated, edit the master"
     heading += "   doc/glossary/glossary-terms.xml to update it."
 
     if len(sys.argv) != 2: