diff --git a/modules/displaytags/helpers/displaytags_installer.php b/modules/displaytags/helpers/displaytags_installer.php
new file mode 100644
index 00000000..42f58c57
--- /dev/null
+++ b/modules/displaytags/helpers/displaytags_installer.php
@@ -0,0 +1,27 @@
+<?php defined("SYSPATH") or die("No direct script access.");/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 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 displaytags_installer {
+  static function install() {
+    module::set_version("displaytags", 1);
+  }
+
+  static function uninstall() {
+    module::delete("displaytags");
+  }
+}
diff --git a/modules/displaytags/helpers/displaytags_theme.php b/modules/displaytags/helpers/displaytags_theme.php
new file mode 100644
index 00000000..1269556b
--- /dev/null
+++ b/modules/displaytags/helpers/displaytags_theme.php
@@ -0,0 +1,41 @@
+<?php defined("SYSPATH") or die("No direct script access.");/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 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 displaytags_theme {  
+  static function sidebar_blocks($theme) {
+    if (!$theme->item()) {
+      return;
+    }
+
+    // Create an array of all the tags for the current item.
+    $tagsItem = ORM::factory("tag")
+      ->join("items_tags", "tags.id", "items_tags.tag_id")
+      ->where("items_tags.item_id", $theme->item->id)
+      ->find_all();
+
+    // If the current item has at least one tag, display it/them.
+    if (count($tagsItem) > 0) {
+      $block = new Block();
+      $block->css_id = "gDisplayTags";
+      $block->title = t("Tags");
+      $block->content = new View("displaytags_block.html");
+      $block->content->tags = $tagsItem;
+      return $block;
+    }
+  }  
+}
diff --git a/modules/displaytags/module.info b/modules/displaytags/module.info
new file mode 100644
index 00000000..b905a8e4
--- /dev/null
+++ b/modules/displaytags/module.info
@@ -0,0 +1,3 @@
+name = DisplayTags
+description = Display all tags for the current photo/album.
+version = 1
diff --git a/modules/displaytags/views/displaytags_block.html.php b/modules/displaytags/views/displaytags_block.html.php
new file mode 100644
index 00000000..a003a415
--- /dev/null
+++ b/modules/displaytags/views/displaytags_block.html.php
@@ -0,0 +1,10 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div class="gDisplayTagsBlock">
+  <? for ($counter=0; $counter<count($tags); $counter++) { ?>
+    <? if ($counter < count($tags)-1) { ?>
+      <a href="<?= url::site("tags/$tags[$counter]") ?>"><?= p::clean($tags[$counter]->name) ?></a>,
+    <? } else {?>
+      <a href="<?= url::site("tags/$tags[$counter]") ?>"><?= p::clean($tags[$counter]->name) ?></a>
+    <? } ?>
+  <? } ?>
+</div>