diff --git a/modules/tag/controllers/tag.php b/modules/tag/controllers/tag.php
new file mode 100644
index 0000000000..0e924f3d88
--- /dev/null
+++ b/modules/tag/controllers/tag.php
@@ -0,0 +1,49 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Tag_Controller extends Controller {
+  public function __call($function, $args) {
+    $tag_name = $function;
+    $tag = ORM::factory("tag")->where("name", "=", $tag_name)->find();
+    $page_size = module::get_var("gallery", "page_size", 9);
+    $page = (int) Input::instance()->get("page", "1");
+    $children_count = $tag->items_count();
+    $offset = ($page-1) * $page_size;
+    $max_pages = max(ceil($children_count / $page_size), 1);
+
+    // Make sure that the page references a valid offset
+    if ($page < 1) {
+      url::redirect($album->abs_url());
+    } else if ($page > $max_pages) {
+      url::redirect($album->abs_url("page=$max_pages"));
+    }
+
+    $template = new Theme_View("page.html", "collection", "tag");
+    $template->set_global("page", $page);
+    $template->set_global("max_pages", $max_pages);
+    $template->set_global("page_size", $page_size);
+    $template->set_global("tag", $tag);
+    $template->set_global("children", $tag->items($page_size, $offset));
+    $template->set_global("children_count", $children_count);
+    $template->content = new View("dynamic.html");
+    $template->content->title = t("Tag: %tag_name", array("tag_name" => $tag->name));
+
+    print $template;
+  }
+}
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index bc657644a6..aa39b6cda6 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -18,34 +18,6 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Tags_Controller extends Controller {
-  public function show($tag_id) {
-    $tag = ORM::factory("tag", $tag_id);
-    $page_size = module::get_var("gallery", "page_size", 9);
-    $page = (int) Input::instance()->get("page", "1");
-    $children_count = $tag->items_count();
-    $offset = ($page-1) * $page_size;
-    $max_pages = max(ceil($children_count / $page_size), 1);
-
-    // Make sure that the page references a valid offset
-    if ($page < 1) {
-      url::redirect($album->abs_url());
-    } else if ($page > $max_pages) {
-      url::redirect($album->abs_url("page=$max_pages"));
-    }
-
-    $template = new Theme_View("page.html", "collection", "tag");
-    $template->set_global("page", $page);
-    $template->set_global("max_pages", $max_pages);
-    $template->set_global("page_size", $page_size);
-    $template->set_global("tag", $tag);
-    $template->set_global("children", $tag->items($page_size, $offset));
-    $template->set_global("children_count", $children_count);
-    $template->content = new View("dynamic.html");
-    $template->content->title = t("Tag: %tag_name", array("tag_name" => $tag->name));
-
-    print $template;
-  }
-
   public function index() {
     // Far from perfection, but at least require view permission for the root album
     $album = ORM::factory("item", 1);
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index e8bd69c59b..269a0f3934 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -124,7 +124,7 @@ public function delete($ignored_id=null) {
    * @param string $query the query string (eg "page=3")
    */
   public function url($query=null) {
-    $url = url::site("tags/show/$this->id");
+    $url = url::site("tag/{$this->name}");
     if ($query) {
       $url .= "?$query";
     }