--- rockbox-3.7-original/apps/tagtree.c	2010-11-30 14:30:35.218529146 -0500
+++ rockbox-3.7/apps/tagtree.c	2010-11-29 16:13:39.197529486 -0500
@@ -24,7 +24,7 @@
  * support the tag cache interface.
  */
 
-/*#define LOGF_ENABLE*/
+#define LOGF_ENABLE
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -720,6 +720,7 @@
     long lastplayed;
     long tagcache_idx;
     bool is_podcast = false;
+    bool is_too_short=false;
     struct mp3entry *id3 = (struct mp3entry*)data;
     
     /* Do not gather data unless proper setting has been enabled. */
@@ -765,12 +766,14 @@
     tagcache_update_numeric(tagcache_idx, tag_lastplayed, lastplayed);
     
     is_podcast = is_podcast_or_audiobook(id3);
+    is_too_short = id3->elapsed < (unsigned long) (15 * 1000);
     /* XXX: save current file resume offset */
     logf("Automatic skip?: %s \n", automatic_skip?"Yes":"No");
+    logf("Too short?: %s \n", is_too_short?"Yes":"No");
     tagcache_update_numeric(tagcache_idx, tag_lastoffset, 
-			    is_podcast && !automatic_skip ?id3->offset:0);
+			    is_podcast && !automatic_skip && !is_too_short ?id3->offset:0);
     logf("tagtree_track_finish_event: Save offset for %s: %lX\n", 
-	 StrOrEmpty(id3->title), is_podcast && !automatic_skip ? id3->offset: 0);
+	 StrOrEmpty(id3->title), is_podcast && !automatic_skip && !is_too_short ? id3->offset: 0);
 
 }