diff --git a/dive.c b/dive.c
index 5c9d3664d..a04c92198 100644
--- a/dive.c
+++ b/dive.c
@@ -2294,16 +2294,14 @@ void dive_create_picture(struct dive *d, char *filename, int shift_time)
 	dive_set_geodata_from_picture(d, p);
 }
 
-void dive_add_picture(struct dive *d, struct picture *picture)
+void dive_add_picture(struct dive *d, struct picture *newpic)
 {
-	if (d->picture_list == NULL) {
-		d->picture_list = picture;
-		return;
-	}
-	struct picture *last = d->picture_list;
-	while( last->next )
-		last = last->next;
-	last->next = picture;
+	struct picture **pic_ptr = &d->picture_list;
+	/* let's keep the list sorted by time */
+	while( *pic_ptr && (*pic_ptr)->timestamp < newpic->timestamp )
+		pic_ptr = &(*pic_ptr)->next;
+	newpic->next = *pic_ptr;
+	*pic_ptr = newpic;
 	return;
 }
 
diff --git a/dive.h b/dive.h
index be6edfc31..279a2944c 100644
--- a/dive.h
+++ b/dive.h
@@ -302,7 +302,7 @@ struct picture {
 
 extern struct picture *alloc_picture();
 extern void dive_create_picture(struct dive *d, char *filename, int shift_time);
-extern void dive_add_picture(struct dive *d, struct picture *pic);
+extern void dive_add_picture(struct dive *d, struct picture *newpic);
 extern void dive_remove_picture(struct dive *d, struct picture *pic);
 extern unsigned int dive_get_picture_count(struct dive *d);
 extern void picture_load_exif_data(struct picture *p);