Bug fix
diff --git a/ChangeLog b/ChangeLog
index 0965c6f..f93d22d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-03  Linus Walleij <triad@df.lth.se>
+
+	* src/libmtp.c: metadata bugs, album name and genre
+	  confused. Fixe it and released libmtp 0.0.7.
+
 2006-06-01  Linus Walleij <triad@df.lth.se>
 
 	* Released libmtp 0.0.6.
diff --git a/src/libmtp.c b/src/libmtp.c
index 9efa886..ee93ca5 100644
--- a/src/libmtp.c
+++ b/src/libmtp.c
@@ -1372,7 +1372,7 @@
       track->artist = LIBMTP_Get_String_From_Object(device, params->handles.Handler[i], PTP_OPC_Artist, 1);
       track->duration = LIBMTP_Get_U32_From_Object(device, params->handles.Handler[i], PTP_OPC_Duration, 0);
       track->tracknumber = LIBMTP_Get_U16_From_Object(device, params->handles.Handler[i], PTP_OPC_Track, 0);
-      track->artist = LIBMTP_Get_String_From_Object(device, params->handles.Handler[i], PTP_OPC_Genre, 1);
+      track->genre = LIBMTP_Get_String_From_Object(device, params->handles.Handler[i], PTP_OPC_Genre, 1);
       track->album = LIBMTP_Get_String_From_Object(device, params->handles.Handler[i], PTP_OPC_AlbumName, 1);
       track->date = LIBMTP_Get_String_From_Object(device, params->handles.Handler[i], PTP_OPC_OriginalReleaseDate, 0);
       
@@ -1993,7 +1993,7 @@
   }
 
   // Update genre
-  ret = LIBMTP_Set_Object_String(device, metadata->item_id, PTP_OPC_Artist, metadata->genre,1);
+  ret = LIBMTP_Set_Object_String(device, metadata->item_id, PTP_OPC_Genre, metadata->genre,1);
   if (ret != 0) {
     printf("LIBMTP_Update_Track_Metadata(): could not set track genre name\n");
     return -1;