diff --git a/pywb/framework/memento.py b/pywb/framework/memento.py
index 29fe7ca8..d5604bc6 100644
--- a/pywb/framework/memento.py
+++ b/pywb/framework/memento.py
@@ -74,10 +74,13 @@ class MementoRespMixin(object):
             is_memento = (wbrequest.wb_url.type == wbrequest.wb_url.REPLAY)
 
         link = []
+        req_url = wbrequest.wb_url.url
 
         if is_memento or is_timegate:
+            url = req_url
             if cdx:
                 ts = cdx['timestamp']
+                url = cdx['original']
             # for top frame
             elif wbrequest.wb_url.timestamp:
                 ts = wbrequest.wb_url.timestamp
@@ -91,13 +94,14 @@ class MementoRespMixin(object):
                     self.status_headers.headers.append(('Memento-Datetime',
                                                        http_date))
 
-                canon_link = wbrequest.urlrewriter.get_new_url(mod='', timestamp=ts)
+                canon_link = wbrequest.urlrewriter.get_new_url(mod='',
+                                                               timestamp=ts,
+                                                               url=url)
+
                 link.append(self.make_memento_link(canon_link,
                                                    'memento',
                                                    http_date))
 
-        req_url = wbrequest.wb_url.url
-
         if is_memento and is_timegate:
             link.append(self.make_link(req_url, 'original timegate'))
         else:
diff --git a/pywb/webapp/views.py b/pywb/webapp/views.py
index 11624a22..036977a1 100644
--- a/pywb/webapp/views.py
+++ b/pywb/webapp/views.py
@@ -189,7 +189,7 @@ class J2HtmlCapturesView(J2TemplateView):
 
 #=================================================================
 class MementoTimemapView(object):
-    def render_response(self, wbrequest, cdx_lines):
+    def render_response(self, wbrequest, cdx_lines, **kwargs):
         memento_lines = make_timemap(wbrequest, cdx_lines)
         return WbResponse.text_stream(memento_lines,
                                       content_type=LINK_FORMAT)