diff --git a/mozilla/browser/components/build/Makefile.in b/mozilla/browser/components/build/Makefile.in
index f64867a1a8c..acadef2e0cb 100644
--- a/mozilla/browser/components/build/Makefile.in
+++ b/mozilla/browser/components/build/Makefile.in
@@ -85,7 +85,7 @@ endif
 
 ifdef MOZ_FEEDS
 LOCAL_INCLUDES += -I$(srcdir)/../feeds/src
-SHARED_LIBRARY_LIBS += ../feeds/src/$(LIB_PREFIX)feeds_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../feeds/src/$(LIB_PREFIX)browser_feeds_s.$(LIB_SUFFIX)
 endif
 
 # Link to gkgfx for GNOME shell service
diff --git a/mozilla/browser/components/feeds/content/subscribe.js b/mozilla/browser/components/feeds/content/subscribe.js
index 84c48a24755..c82ef64c943 100644
--- a/mozilla/browser/components/feeds/content/subscribe.js
+++ b/mozilla/browser/components/feeds/content/subscribe.js
@@ -39,7 +39,7 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 
-const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+const HTML_NS = "http://www.w3.org/1999/xhtml";
 const TYPE_MAYBE_FEED = "application/vnd.mozilla.maybe.feed";
 const URI_BUNDLE = "chrome://browser/content/feeds/subscribe.properties";
 
@@ -164,18 +164,30 @@ var SubscribeHandler = {
       LOG("Failed to set Title Image (this is benign): " + e);
     }
     
+    // XXXben - do something with this. parameterize?
+    const MAX_CHARS = 600;
+    
     // Build the actual feed content
     var feedContent = document.getElementById("feedContent");
     var feed = container.QueryInterface(Ci.nsIFeed);
     for (var i = 0; i < feed.items.length; ++i) {
       var entry = feed.items.queryElementAt(i, Ci.nsIFeedEntry);
-      var title = document.createElementNS(XUL_NS, "label");
-      title.value = entry.summary(true, 100);
-      title.className = "feedEntryTitle";
-      var body = document.createElementNS(XUL_NS, "description");
-      body.appendChild(document.createTextNode(entry.content(true)));
-      body.className = "feedEntryContent";
+      entry.QueryInterface(Ci.nsIFeedContainer);
+      var a = document.createElementNS(HTML_NS, "a");
+      a.appendChild(document.createTextNode(entry.title));
+      a.setAttribute("href", entry.link.spec);
+      var title = document.createElementNS(HTML_NS, "h3");
+      title.appendChild(a);
       feedContent.appendChild(title);
+      
+      var body = document.createElementNS(HTML_NS, "p");
+      var summary = entry.summary(true)
+      if (summary.length > MAX_CHARS)
+        summary = summary.substring(0, MAX_CHARS) + "...";
+      
+      // XXXben - Change to use innerHTML
+      body.appendChild(document.createTextNode(summary));
+      body.className = "feedEntryContent";
       feedContent.appendChild(body);
     }    
   },
diff --git a/mozilla/browser/components/feeds/content/subscribe.xhtml b/mozilla/browser/components/feeds/content/subscribe.xhtml
index 12837464e4c..d7c695636e5 100644
--- a/mozilla/browser/components/feeds/content/subscribe.xhtml
+++ b/mozilla/browser/components/feeds/content/subscribe.xhtml
@@ -66,58 +66,7 @@
           <h2 id="feedSubtitleText"/>
         </div>
       </div>
-      <div id="feedContent">
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-        <p>Content</p>
-      </div>
+      <div id="feedContent"/>
     </div>
   </body>
 </html>
diff --git a/mozilla/browser/components/feeds/src/Makefile.in b/mozilla/browser/components/feeds/src/Makefile.in
index 2e06e2e99b2..4a563f92895 100644
--- a/mozilla/browser/components/feeds/src/Makefile.in
+++ b/mozilla/browser/components/feeds/src/Makefile.in
@@ -41,8 +41,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = feeds
-LIBRARY_NAME = feeds_s
+MODULE = browser_feeds
+LIBRARY_NAME = browser_feeds_s
 
 EXTRA_PP_COMPONENTS = \
 	FeedConverter.js \
diff --git a/mozilla/browser/themes/pinstripe/browser/feeds/subscribe.css b/mozilla/browser/themes/pinstripe/browser/feeds/subscribe.css
index 866a68b356b..7a68a45b8f0 100755
--- a/mozilla/browser/themes/pinstripe/browser/feeds/subscribe.css
+++ b/mozilla/browser/themes/pinstripe/browser/feeds/subscribe.css
@@ -143,6 +143,10 @@ a[href] img {
   margin: 0 0 0 .6em;
 }
 
+.feedEntryContent {
+  font-size: 110%;
+}
+ 
 .link {
   color: #0000FF;
   text-decoration: underline;
diff --git a/mozilla/browser/themes/winstripe/browser/feeds/subscribe.css b/mozilla/browser/themes/winstripe/browser/feeds/subscribe.css
index 452a7850e76..9bb25c1f040 100644
--- a/mozilla/browser/themes/winstripe/browser/feeds/subscribe.css
+++ b/mozilla/browser/themes/winstripe/browser/feeds/subscribe.css
@@ -143,6 +143,10 @@ a[href] img {
   margin: 0 0 0 .6em;
 }
 
+.feedEntryContent {
+  font-size: 110%;
+}
+
 .link {
   color: #0000FF;
   text-decoration: underline;