diff --git a/ChangeLog b/ChangeLog
index d383868cb..e6ff627ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,8 @@
 - TW-1569 update wait:<wait-date> manpage entry (thanks to David Patrick).
 - TW-1572 Better urgency inheritance (thanks to Jens Erat).
 - TW-1575 `task log` mangles URLs when quoted (thanks to Luke Macken).
+- TW-1592 Able to add duplicate tags using 'tags:<value>' (thanks to Tomas
+          Babej).
 - TW-1600 Filtering "regressions"(?) in task-2.4.3, task-2.4.4 (thanks to Ralph
           Bean).
 - TW-1609 In 'urgency<10', 10 is interpreted as an ID (thanks to Wim Schuermann).
diff --git a/src/Task.cpp b/src/Task.cpp
index 2c9959772..26a066742 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1949,6 +1949,23 @@ void Task::modify (modType type, bool text_required /* = false */)
             ++modCount;
           }
 
+          // For those using the "tags:..." attribute directly.
+          else if (name == "tags")
+          {
+            std::vector <std::string> tags;
+            split (tags, value, ',');
+
+            for (auto& tag : tags)
+            {
+              addTag (tag);
+              context.debug (label + "tags <-- add '" + tag + "'");
+              addTag (tag);
+              feedback_special_tags (*this, tag);
+            }
+
+            ++modCount;
+          }
+
           // Dates are special, maybe.
           else if (column->type () == "date")
           {