diff --git a/taiga/timeline/management/commands/update_timeline_for_updated_tasks.py b/taiga/timeline/management/commands/update_timeline_for_updated_tasks.py
new file mode 100644
index 00000000..15b42172
--- /dev/null
+++ b/taiga/timeline/management/commands/update_timeline_for_updated_tasks.py
@@ -0,0 +1,86 @@
+# Copyright (C) 2014 Andrey Antukh <niwi@niwi.be>
+# Copyright (C) 2014 Jesús Espino <jespinog@gmail.com>
+# Copyright (C) 2014 David Barragán <bameda@dbarragan.com>
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.management.base import BaseCommand
+from django.db.models import Prefetch, F
+
+from taiga.timeline.models import Timeline
+from taiga.timeline.timeline_implementations import userstory_timeline
+from optparse import make_option
+from taiga.projects.tasks.models import Task
+from taiga.projects.userstories.models import UserStory
+
+
+def update_timeline(initial_date, final_date):
+    timelines = Timeline.objects.all()
+    if initial_date:
+        timelines = timelines.filter(created__gte=initial_date)
+    if final_date:
+        timelines = timelines.filter(created__lt=final_date)
+
+    timelines = timelines.filter(event_type="tasks.task.change")
+    
+    print("Generating tasks indexed by id dict")
+    task_ids = timelines.values_list("object_id", flat=True)
+    tasks_per_id = {task.id: task for task in Task.objects.filter(id__in=task_ids).select_related("user_story").iterator()}
+    del task_ids
+
+    counter = 1
+    total = timelines.count()
+    print("Updating timelines")
+    for timeline in timelines.iterator():
+        print("%s/%s"%(counter, total))
+        task_id = timeline.object_id
+        task = tasks_per_id.get(task_id, None)
+        if not task:
+            counter += 1
+            continue
+
+        user_story = tasks_per_id[task_id].user_story
+        if not user_story:
+            counter += 1
+            continue
+
+        timeline.data["task"]["userstory"] = userstory_timeline(user_story)
+        timeline.save(update_fields=["data"])
+        counter += 1
+
+
+class Command(BaseCommand):
+    help = 'Regenerate project timeline'
+    option_list = BaseCommand.option_list + (
+        make_option('--initial_date',
+                    action='store',
+                    dest='initial_date',
+                    default=None,
+                    help='Initial date for timeline update'),
+        ) + (
+        make_option('--final_date',
+                    action='store',
+                    dest='final_date',
+                    default=None,
+                    help='Final date for timeline update'),
+        )
+
+    def handle(self, *args, **options):
+        debug_enabled = settings.DEBUG
+        if debug_enabled:
+            print("Please, execute this script only with DEBUG mode disabled (DEBUG=False)")
+            return
+
+        update_timeline(options["initial_date"], options["final_date"])
diff --git a/taiga/timeline/models.py b/taiga/timeline/models.py
index 52882850..5a070c49 100644
--- a/taiga/timeline/models.py
+++ b/taiga/timeline/models.py
@@ -36,11 +36,6 @@ class Timeline(models.Model):
     data_content_type = models.ForeignKey(ContentType, related_name="data_timelines")
     created = models.DateTimeField(default=timezone.now)
 
-    def save(self, *args, **kwargs):
-        if self.id:
-            raise ValidationError("Not modify allowed for timeline entries")
-        return super().save(*args, **kwargs)
-
     class Meta:
         index_together = [('content_type', 'object_id', 'namespace'), ]
 
diff --git a/taiga/timeline/timeline_implementations.py b/taiga/timeline/timeline_implementations.py
index 69f5f83f..8a782ce1 100644
--- a/taiga/timeline/timeline_implementations.py
+++ b/taiga/timeline/timeline_implementations.py
@@ -76,10 +76,13 @@ def task_timeline(instance, extra_data={}):
         "task": service.extract_task_info(instance),
         "project": service.extract_project_info(instance.project),
     }
+
+    if instance.user_story:
+        result["task"]["userstory"] = service.extract_userstory_info(instance.user_story)
+
     result.update(extra_data)
     return result
 
-
 @register_timeline_implementation("wiki.wikipage", "create")
 @register_timeline_implementation("wiki.wikipage", "change")
 @register_timeline_implementation("wiki.wikipage", "delete")