Index: trunk/BookmarkApp.pm
===================================================================
--- trunk/BookmarkApp.pm	(revision 16)
+++ trunk/BookmarkApp.pm	(revision 17)
@@ -13,5 +13,5 @@
 my $base_uri = URI->new;
 $base_uri->scheme('http');
-$base_uri->host($ENV{SERVER_NAME});
+$base_uri->host($ENV{HTTP_X_FORWARDED_HOST} || $ENV{SERVER_NAME});
 $base_uri->port($ENV{SERVER_PORT});
 $base_uri->path($ENV{SCRIPT_NAME} . '/');
@@ -123,5 +123,5 @@
     my $feed = XML::Atom::Feed->new;
     $feed->title('Bookmarks' . ($tag ? " tagged as $tag" : ''));
-    $feed->id($base_uri . 'feed');
+    $feed->id($base_uri->canonical . 'feed');
 
     # construct a feed from the most recent 12 bookmarks