diff --git a/app/models/person.rb b/app/models/person.rb
index 75bd2b39b..28503e921 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -50,7 +50,7 @@ class Person
   end
 
   def public_url
-    "#{self.url}users/#{self.owner.username}/public.atom"
+    "#{self.url}users/#{self.owner.username}/public"
   end
 
 
diff --git a/lib/diaspora/ostatus_builder.rb b/lib/diaspora/ostatus_builder.rb
index 60c90f704..74011e79a 100644
--- a/lib/diaspora/ostatus_builder.rb
+++ b/lib/diaspora/ostatus_builder.rb
@@ -28,7 +28,7 @@ module Diaspora
 <?xml version="1.0" encoding="UTF-8"?>
 <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
 <generator uri="http://joindiaspora.com/">Diaspora</generator>
-<id>#{@user.public_url}</id>
+<id>#{@user.public_url}.atom</id>
 <title>#{@user.real_name}'s Public Feed</title>
 <subtitle>its a stream</subtitle>
 <updated>#{Time.now.xmlschema}</updated>