diff --git a/fanficfare/adapters/base_adapter.py b/fanficfare/adapters/base_adapter.py
index 22ac269c..44767a05 100644
--- a/fanficfare/adapters/base_adapter.py
+++ b/fanficfare/adapters/base_adapter.py
@@ -624,7 +624,7 @@ class BaseSiteAdapter(Configurable):
         if self.getConfig('replace_hr'):
             # replacing a self-closing tag with a container tag in the
             # soup is more difficult than it first appears.  So cheat.
-            retval = retval.replace("<hr />","<div class='center'>* * *</div>")
+            retval = re.sub("<hr[^>]*>","<div class='center'>* * *</div>",retval)
 
         return retval
 
diff --git a/fanficfare/writers/writer_epub.py b/fanficfare/writers/writer_epub.py
index 04b45521..33b15096 100644
--- a/fanficfare/writers/writer_epub.py
+++ b/fanficfare/writers/writer_epub.py
@@ -279,7 +279,9 @@ div { margin: 0pt; padding: 0pt; }
         retval = retval + END.substitute(self.story.getAllMetadata())
         
         if self.getConfig('replace_hr'):
-            retval = retval.replace("<hr />","<div class='center'>* * *</div>")
+            # replacing a self-closing tag with a container tag in the
+            # soup is more difficult than it first appears.  So cheat.
+            retval = re.sub("<hr[^>]*>","<div class='center'>* * *</div>",retval)
             
         return retval