diff --git a/src/IDF/Timeline.php b/src/IDF/Timeline.php
index e85868d..68900ea 100644
--- a/src/IDF/Timeline.php
+++ b/src/IDF/Timeline.php
@@ -130,4 +130,30 @@ class IDF_Timeline extends Pluf_Model
         $t->create();
         return true;
     }
+
+    /**
+     * Remove an item from the timeline.
+     *
+     * You must call this function when you delete items wich are
+     * tracked in the timeline. Just add the call:
+     *
+     * IDF_Timeline::remove($this);
+     *
+     * in the preDelete() method of your object.
+     *
+     * @param mixed Item to be removed
+     * @return bool Success
+     */
+    public static function insert($item)
+    {
+        if ($item->id > 0) {
+            $sql = new Pluf_SQL('model_id=%s AND model_class=%s',
+                                array($item->id, $item->_model));
+            $items = Pluf::factory('IDF_Timeline')->getList(array('filter'=>$sql->gen()));
+            foreach ($items as $tl) {
+                $tl->delete();
+            }
+        }
+        return true;
+    }
 }
diff --git a/src/IDF/Upload.php b/src/IDF/Upload.php
index 25715b7..6b302fe 100644
--- a/src/IDF/Upload.php
+++ b/src/IDF/Upload.php
@@ -155,6 +155,14 @@ class IDF_Upload extends Pluf_Model
     }
 
     /**
+     * We drop the information from the timeline.
+     */
+    function preDelete()
+    {
+        IDF_Timeline::remove($this);
+    }
+
+    /**
      * Returns the timeline fragment for the file.
      *
      *