diff --git a/src/calibre/library/catalogs/epub_mobi.py b/src/calibre/library/catalogs/epub_mobi.py
index de56e27e6e..0645416ecf 100644
--- a/src/calibre/library/catalogs/epub_mobi.py
+++ b/src/calibre/library/catalogs/epub_mobi.py
@@ -408,8 +408,8 @@ class EPUB_MOBI(CatalogPlugin):
 
             # Run ebook-convert
             from calibre.ebooks.conversion.plumber import Plumber
-            plumber = Plumber(os.path.join(catalog.catalog_path,
-                            opts.basename + '.opf'), path_to_output, log, report_progress=notification,
+            plumber = Plumber(os.path.join(catalog.catalog_path, opts.basename + '.opf'),
+                            path_to_output, log, report_progress=notification,
                             abort_after_input_dump=False)
             plumber.merge_ui_recommendations(recommendations)
             plumber.run()
diff --git a/src/calibre/library/catalogs/epub_mobi_builder.py b/src/calibre/library/catalogs/epub_mobi_builder.py
index dbc73925b6..10c3103cef 100644
--- a/src/calibre/library/catalogs/epub_mobi_builder.py
+++ b/src/calibre/library/catalogs/epub_mobi_builder.py
@@ -3905,7 +3905,7 @@ class CatalogBuilder(object):
         mtc = 0
 
         titleTag = Tag(soup, "dc:title")
-        titleTag.insert(0,self.opts.catalog_title)
+        titleTag.insert(0,escape(self.opts.catalog_title))
         metadata.insert(mtc, titleTag)
         mtc += 1