diff --git a/ChangeLog b/ChangeLog
index fce6d39fbe..aafaea342d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-14  Benjamin Otte  <in7y118@public.uni-hamburg.de>
+
+	* ext/flac/gstflacenc.c: (gst_flacenc_set_metadata),
+	(gst_flacenc_chain):
+	  handle tags correctly
+	* gst/tags/gstid3tag.c: (gst_tag_list_new_from_id3v1):
+	  extract ID3v1 tags correctly
+
 2004-01-14  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst/typefind/gsttypefindfunctions.c: (matroska_type_find),
diff --git a/gst/tags/gstid3tag.c b/gst/tags/gstid3tag.c
index e2c466191b..871fbbdbea 100644
--- a/gst/tags/gstid3tag.c
+++ b/gst/tags/gstid3tag.c
@@ -293,13 +293,13 @@ gst_tag_list_new_from_id3v1 (const guint8 *data)
     gst_tag_list_add (list, GST_TAG_MERGE_REPLACE, GST_TAG_DATE, year, NULL);
   }
   if (data[125] == 0) {
-    gst_tag_extract (list, GST_TAG_ALBUM, &data[97], 28);
+    gst_tag_extract (list, GST_TAG_COMMENT, &data[97], 28);
     gst_tag_list_add (list, GST_TAG_MERGE_REPLACE, GST_TAG_TRACK_NUMBER, (guint) data[126], NULL);
   } else {
-    gst_tag_extract (list, GST_TAG_ALBUM, &data[97], 30);
+    gst_tag_extract (list, GST_TAG_COMMENT, &data[97], 30);
   }
   if (data[127] < gst_tag_id3_genre_count ()) {
-    gst_tag_list_add (list, GST_TAG_MERGE_REPLACE, GST_TAG_TRACK_NUMBER, gst_tag_id3_genre_get (data[126]), NULL);
+    gst_tag_list_add (list, GST_TAG_MERGE_REPLACE, GST_TAG_GENRE, gst_tag_id3_genre_get (data[127]), NULL);
   }
 
   return list;