diff --git a/3.0/modules/date_tag/README.md b/3.0/modules/date_tag/README.md
new file mode 100644
index 00000000..eaa29571
--- /dev/null
+++ b/3.0/modules/date_tag/README.md
@@ -0,0 +1,4 @@
+date_tag
+========
+
+Gallery3 module to automatically add tags matching the image captured date
\ No newline at end of file
diff --git a/3.0/modules/date_tag/helpers/date_tag.php b/3.0/modules/date_tag/helpers/date_tag.php
new file mode 100644
index 00000000..424cdf15
--- /dev/null
+++ b/3.0/modules/date_tag/helpers/date_tag.php
@@ -0,0 +1,29 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2013 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 date_tag {
+  static function tag_item($item) {
+
+    if ($item->is_photo() && $item->captured) {
+      tag::add($item, date("F", $item->captured));
+      tag::add($item, date("Y", $item->captured));
+    }
+    return;
+  }
+}
diff --git a/3.0/modules/date_tag/helpers/date_tag_event.php b/3.0/modules/date_tag/helpers/date_tag_event.php
new file mode 100644
index 00000000..cca9ab76
--- /dev/null
+++ b/3.0/modules/date_tag/helpers/date_tag_event.php
@@ -0,0 +1,32 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2013 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 date_tag_event_Core {
+  static function item_created($item) {
+    date_tag::tag_item($item);
+  }
+
+  static function item_updated($original, $new) {
+    date_tag::tag_item($new);
+  }
+
+  static function item_related_update($item) {
+    date_tag::tag_item($item);
+  }
+}
diff --git a/3.0/modules/date_tag/helpers/date_tag_installer.php b/3.0/modules/date_tag/helpers/date_tag_installer.php
new file mode 100644
index 00000000..40ac5e84
--- /dev/null
+++ b/3.0/modules/date_tag/helpers/date_tag_installer.php
@@ -0,0 +1,42 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2013 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 date_tag_installer {
+  static function install() {
+    module::set_version("date_tag", 1);
+  }
+
+  static function upgrade($version) {
+    if ($version == 1) {
+      module::set_version("date_tag", $version = 1);
+    }
+  }
+
+  static function deactivate() {
+    site_status::clear("date_tag_needs_tag");
+  }
+
+  static function can_activate() {
+    $messages = array();
+    if (!module::is_active("tag")) {
+      $messages["warn"][] = t("The date_tag module requires the Tag module.");
+    }
+    return $messages;
+  }
+}
diff --git a/3.0/modules/date_tag/helpers/date_tag_task.php b/3.0/modules/date_tag/helpers/date_tag_task.php
new file mode 100644
index 00000000..290b0e98
--- /dev/null
+++ b/3.0/modules/date_tag/helpers/date_tag_task.php
@@ -0,0 +1,89 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2012 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 date_tag_task_Core {
+
+	static function available_tasks() {
+		$tasks[] = Task_Definition::factory()
+			->callback("date_tag_task::date_tag_all")
+			->name(t("Add tags for dates"))
+			->description(t("Add tags for dates of all images that have already been uploaded"))
+			->severity(log::SUCCESS);
+		return $tasks;
+	}
+
+	/**
+	 * @param Task_Model the task
+	 */
+	static function date_tag_all($task) {
+		$errors = array();
+		try {
+			$start = microtime(true);
+			$last_item_id= $task->get("last_item_id", null);
+			$current = 0;
+			$total = 0;
+
+			switch ($task->get("mode", "init")) {
+			case "init":
+				$task->set("total", ORM::factory("item")->where("type", "=", "photo")->count_all());
+				$task->set("mode", "date_tag_all");
+				$task->set("completed", 0);
+				$task->set("last_item_id", 0);
+
+			case "date_tag_all":
+				$completed = $task->get("completed");
+				$total = $task->get("total");
+				$last_item_id= $task->get("last_item_id");
+				$items = ORM::factory("item")
+					->where("id", ">", $last_item_id)
+					->and_where("type", "=", "photo")
+					->find_all(5); /* TODO: should we fetch more at a time? Less? */
+				while ($current < $total && microtime(true) - $start < 1 && $item = $items->current()) {
+					$last_tem_id = $item->id;
+					$task->log("Looking at item {$item->name} (id: {$item->id})");
+					date_tag::tag_item($item);
+
+					$completed++;
+					$items->next();
+					$task->percent_complete = $completed / $total * 100;
+					$task->set("completed", $completed);
+					$task->set("last_item_id", $item->id);
+
+
+					$task->status = t2("Examined %count items", "Examined %count items", $completed);
+
+					if ($completed == $total) {
+						$task->done = true;
+						$task->state = "success";
+						$task->percent_complete = 100;
+					}
+				}
+			}
+		} catch (Exception $e) {
+			Kohana_Log::add("error",(string)$e);
+			$task->done = true;
+			$task->state = "error";
+			$task->status = $e->getMessage();
+			$errors[] = (string)$e;
+		}
+		if ($errors) {
+			$task->log($errors);
+		}
+	}
+}
diff --git a/3.0/modules/date_tag/module.info b/3.0/modules/date_tag/module.info
new file mode 100644
index 00000000..abd68be0
--- /dev/null
+++ b/3.0/modules/date_tag/module.info
@@ -0,0 +1,7 @@
+name = "Date Tag"
+description = "Automatically add tags with the captured date"
+version = 1
+author_name ="mikeage"
+author_url = "http://mikeage.net"
+info_url = "http://TODO"
+discuss_url = "http://TODO"