--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -14,10 +14,20 @@ class UsersController < ApplicationController
     
     @commits_last_week = @user.events.count(:all, 
       :conditions => ["created_at > ? AND action = ?", 7.days.ago, Action::COMMIT])
-    @atom_auto_discovery_url = formatted_user_path(@user, :atom)
+    @atom_auto_discovery_url = formatted_feed_user_path(@user, :atom)
     
     respond_to do |format|
       format.html { }
+      format.atom { redirect_to formatted_feed_user_path(@user, :atom) }
+    end
+  end
+  
+  def feed
+    @user = User.find_by_login!(params[:id])
+    @events = @user.events.find(:all, :order => "events.created_at desc", 
+      :include => [:user, :project], :limit => 30)
+    respond_to do |format|
+      format.html { redirect_to user_path(@user) }
       format.atom { }
     end
   end

--- /dev/null
+++ b/app/views/users/feed.atom.builder
@@ -0,0 +1,19 @@
+atom_feed do |feed|
+  feed.title("Gitorious: #{@user.login}'s activity")
+  feed.updated((@events.blank? ? Time.now : @events.first.created_at))
+
+  @events.each do |event|
+    action, body, category = action_and_body_for_event(event)
+    item_url = "http://#{GitoriousConfig['gitorious_host']}" + user_path(@user)
+    feed.entry(event, :url => item_url) do |entry|
+      entry.title("#{h(event.user.login)} #{strip_tags(action)}")
+      entry.content(<<-EOS, :type => 'html')
+<p>#{link_to event.user.login, user_path(event.user)} #{action}</p>
+<p>#{body}<p>
+EOS
+      entry.author do |author|
+        author.name(event.user.login)
+      end
+    end
+  end
+end
\ No newline at end of file

--- a/app/views/users/show.atom.builder
+++ /dev/null
@@ -1,19 +0,0 @@
-atom_feed do |feed|
-  feed.title("Gitorious: #{@user.login}'s activity")
-  feed.updated((@events.blank? ? Time.now : @events.first.created_at))
-
-  @events.each do |event|
-    action, body, category = action_and_body_for_event(event)
-    item_url = "http://#{GitoriousConfig['gitorious_host']}" + user_path(@user)
-    feed.entry(event, :url => item_url) do |entry|
-      entry.title("#{h(event.user.login)} #{strip_tags(action)}")
-      entry.content(<<-EOS, :type => 'html')
-<p>#{link_to event.user.login, user_path(event.user)} #{action}</p>
-<p>#{body}<p>
-EOS
-      entry.author do |author|
-        author.name(event.user.login)
-      end
-    end
-  end
-end
\ No newline at end of file

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,10 +24,10 @@ ActionController::Routing::Routes.draw do |map|
     account.resources :keys
   end
   map.connect "users/activate/:activation_code", :controller => "users", :action => "activate"
-  map.resources :users, :requirements => {:id => /[^\/\\\.\s]+/ }, :collection => { # FIXME: fails if login contains .
+  map.resources :users, :requirements => {:id => /.+/ }, :collection => {
     :forgot_password => :get,
     :reset_password => :post,
-  }
+  }, :member => { :feed => :get }
   map.resources  :events
   map.resource  :sessions
   map.with_options(:controller => "projects", :action => "category") do |project_cat|

--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -98,6 +98,20 @@ describe UsersController do
     (assigns[:commits_last_week] >= 0).should == true
   end
   
+  it "#show sets atom feed autodiscovery" do
+    user = users(:johan)
+    get :show, :id => user.login
+    assigns[:atom_auto_discovery_url].should == formatted_feed_user_path(user, :atom)
+  end
+  
+  it "has an atom feed" do
+    user = users(:johan)
+    get :feed, :id => user.login, :format => "atom"
+    response.should be_success
+    assigns[:user].should == user
+    assigns[:events].should == user.events.find(:all, :limit => 30, :order => "created_at desc")
+  end
+  
   describe "#forgot_password" do
     it "GETs the page fine for everyone" do
       get :forgot_password