diff --git a/config/routes.rb b/config/routes.rb
index 48be574..a78ea0d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -37,8 +37,8 @@ ActionController::Routing::Routes.draw do |map|
   map.category 'cat/*path', :controller => 'category', :action => 'view'
 
   # tags
-  map.tag 'tag', :controller => 'tag', :action => 'index'
-  map.tag 'tag/:tag', :controller => 'tag', :action => 'view'
+  map.tag 'tag', :controller => 'search', :action => 'tags'
+  map.tag 'tag/:tag', :controller => 'search', :action => 'tag'
 
   # controllers for blocks
   map.controllers 'block/:profile/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_from_design_blocks
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 13a1bed..61bc30f 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -90,8 +90,8 @@ class RoutingTest < ActionController::IntegrationTest
   end
 
   def test_tag_viewing
-    assert_routing('/tag', :controller => 'tag', :action => 'index')
-    assert_routing('/tag/umboraminhaporra', :controller => 'tag', :action => 'view', :tag => 'umboraminhaporra')
+    assert_routing('/tag', :controller => 'search', :action => 'tags')
+    assert_routing('/tag/umboraminhaporra', :controller => 'search', :action => 'tag', :tag => 'umboraminhaporra')
   end
 
 end
--
libgit2 0.21.2