diff --git a/epilogue/archive_generator.py b/epilogue/archive_generator.py
index c7ae064..71b76c3 100644
--- a/epilogue/archive_generator.py
+++ b/epilogue/archive_generator.py
@@ -58,7 +58,7 @@ class ArchiveGenerator():
                 if page.namespace != WIKI_NAMESPACES['MAIN']:
                     continue
 
-                page_out = "{}.html".format(page.title).replace(" ", "_")
+                page_out = f"{reformat_page_title(page.title)}.html"
                 base = ""
                 if "/" in page_out:
                     base = "../" * page_out.count("/")
diff --git a/epilogue/wiki.py b/epilogue/wiki.py
index 5594ee5..35eaf99 100644
--- a/epilogue/wiki.py
+++ b/epilogue/wiki.py
@@ -178,7 +178,7 @@ def translate_image_title (page_title):
             return reformat_page_title(page_title[len(namespace):])
 
 def reformat_page_title (page_title):
-    return "{}{}".format(page_title[0].upper(), page_title[1:].replace(" ", "_"))
+    return "{}{}".format(page_title[0].upper(), page_title[1:].replace(" ", "_").replace("/", "%2F"))
 
 class Template():
     def __init__ (self, wikicode):