diff --git a/install/db/161-database.php b/install/db/161-database.php
new file mode 100644
index 000000000..9fcf91365
--- /dev/null
+++ b/install/db/161-database.php
@@ -0,0 +1,53 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | This file is part of Piwigo.                                          |
+// |                                                                       |
+// | For copyright and license information, please view the COPYING.txt    |
+// | file that was distributed with this source code.                      |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+$upgrade_description = 'remove doubled activities on tag addition';
+
+$tag_ids_added = array();
+$to_delete_activities = array();
+
+$query = '
+SELECT
+    *
+  FROM '.PREFIX_TABLE.'activity
+  WHERE object = "tag"
+    AND action = "add"
+  ORDER BY activity_id ASC
+;';
+
+$result = pwg_query($query);
+while ($row = pwg_db_fetch_assoc($result))
+{
+  if (isset($tag_ids_added[ $row['object_id'] ]))
+  {
+    array_push($to_delete_activities, $row['activity_id']);
+  }
+  else
+  {
+    $tag_ids_added[ $row['object_id'] ] = 1;
+  }
+}
+
+if (count($to_delete_activities) > 0)
+{
+  $query = '
+DELETE 
+  FROM '.PREFIX_TABLE.'activity 
+  WHERE activity_id IN ('.implode(',', $to_delete_activities).')
+;';
+  pwg_query($query);
+}
+
+echo "\n".$upgrade_description."\n";
+
+?>