diff --git a/pelican/__init__.py b/pelican/__init__.py
index 70013804..89eefdd3 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -170,6 +170,10 @@ class Pelican(object):
             if hasattr(p, 'generate_context'):
                 p.generate_context()
 
+        for p in generators:
+            if hasattr(p, 'refresh_metadata_intersite_links'):
+                p.refresh_metadata_intersite_links()
+
         signals.all_generators_finalized.send(generators)
 
         writer = self.get_writer()
diff --git a/pelican/contents.py b/pelican/contents.py
index d8881fe9..310690ba 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -140,9 +140,8 @@ class Content(object):
         if not hasattr(self, 'status'):
             self.status = getattr(self, 'default_status', None)
 
-        # store the summary metadata if it is set
-        if 'summary' in metadata:
-            self._summary = metadata['summary']
+        if len(self._context.get('filenames', [])) > 0:
+            self.refresh_metadata_intersite_links()
 
         signals.content_object_init.send(self)