diff --git a/src/filescanner_itunes.c b/src/filescanner_itunes.c
new file mode 100644
index 00000000..a42d726b
--- /dev/null
+++ b/src/filescanner_itunes.c
@@ -0,0 +1,867 @@
+/*
+ * Copyright (C) 2009 Julien BLACHE <jb@jblache.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <sys/mman.h>
+
+#include <stdint.h>
+#include <inttypes.h>
+
+#include <avl.h>
+#include <plist/plist.h>
+
+#include "evhttp/evhttp.h"
+
+#include "logger.h"
+#include "db.h"
+#include "filescanner.h"
+#include "conffile.h"
+
+
+/* Mapping between iTunes library IDs and our DB IDs */
+struct itml_to_db_map {
+  uint64_t itml_id;
+  uint32_t db_id;
+};
+
+/* Mapping between iTunes library metadata keys and the offset
+ * of the equivalent metadata field in struct media_file_info */
+struct metadata_map {
+  char *key;
+  plist_type type;
+  size_t offset;
+};
+
+static struct metadata_map md_map[] =
+  {
+    { "Name",         PLIST_STRING,  mfi_offsetof(title) },
+    { "Artist",       PLIST_STRING,  mfi_offsetof(artist) },
+    { "Album",        PLIST_STRING,  mfi_offsetof(album) },
+    { "Genre",        PLIST_STRING,  mfi_offsetof(genre) },
+    { "Comments",     PLIST_STRING,  mfi_offsetof(comment) },
+    { "Track Count",  PLIST_UINT,    mfi_offsetof(total_tracks) },
+    { "Track Number", PLIST_UINT,    mfi_offsetof(track) },
+    { "Disc Count",   PLIST_UINT,    mfi_offsetof(total_discs) },
+    { "Disc Number",  PLIST_UINT,    mfi_offsetof(disc) },
+    { "Year",         PLIST_UINT,    mfi_offsetof(year) },
+    { "Total Time",   PLIST_UINT,    mfi_offsetof(song_length) },
+    { "Bit Rate",     PLIST_UINT,    mfi_offsetof(bitrate) },
+    { "Sample Rate",  PLIST_UINT,    mfi_offsetof(samplerate) },
+    { "Rating",       PLIST_UINT,    mfi_offsetof(rating) },
+    { "Compilation",  PLIST_BOOLEAN, mfi_offsetof(compilation) },
+    { "Date Added",   PLIST_DATE,    mfi_offsetof(time_added) },
+    { NULL,           0, 0 }
+  };
+
+static avl_tree_t *itml_to_db;
+
+
+static int
+itml_to_db_compare(const void *aa, const void *bb)
+{
+  struct itml_to_db_map *a = (struct itml_to_db_map *)aa;
+  struct itml_to_db_map *b = (struct itml_to_db_map *)bb;
+
+  if (a->itml_id < b->itml_id)
+    return -1;
+
+  if (a->itml_id > b->itml_id)
+    return 1;
+
+  return 0;
+}
+
+
+/* plist helpers */
+static int
+get_dictval_int_from_key(plist_t dict, const char *key, uint64_t *val)
+{
+  plist_t node;
+
+  node = plist_dict_get_item(dict, key);
+
+  if (!node)
+    return -1;
+
+  if (plist_get_node_type(node) != PLIST_UINT)
+    return -1;
+
+  plist_get_uint_val(node, val);
+
+  return 0;
+}
+
+static int
+get_dictval_date_from_key(plist_t dict, const char *key, uint32_t *val)
+{
+  plist_t node;
+  int32_t secs;
+  int32_t dummy;
+
+  node = plist_dict_get_item(dict, key);
+
+  if (!node)
+    return -1;
+
+  if (plist_get_node_type(node) != PLIST_DATE)
+    return -1;
+
+  plist_get_date_val(node, &secs, &dummy);
+
+  *val = (uint32_t) secs;
+
+  return 0;
+}
+
+static int
+get_dictval_bool_from_key(plist_t dict, const char *key, uint8_t *val)
+{
+  plist_t node;
+
+  node = plist_dict_get_item(dict, key);
+
+  /* Not present means false */
+  if (!node)
+    {
+      *val = 0;
+
+      return 0;
+    }
+
+  if (plist_get_node_type(node) != PLIST_BOOLEAN)
+    return -1;
+
+  plist_get_bool_val(node, val);
+
+  return 0;
+}
+
+static int
+get_dictval_string_from_key(plist_t dict, const char *key, char **val)
+{
+  plist_t node;
+
+  node = plist_dict_get_item(dict, key);
+
+  if (!node)
+    return -1;
+
+  if (plist_get_node_type(node) != PLIST_STRING)
+    return -1;
+
+  plist_get_string_val(node, val);
+
+  return 0;
+}
+
+static int
+get_dictval_dict_from_key(plist_t dict, const char *key, plist_t *val)
+{
+  plist_t node;
+
+  node = plist_dict_get_item(dict, key);
+
+  if (!node)
+    return -1;
+
+  if (plist_get_node_type(node) != PLIST_DICT)
+    return -1;
+
+  *val = node;
+
+  return 0;
+}
+
+static int
+get_dictval_array_from_key(plist_t dict, const char *key, plist_t *val)
+{
+  plist_t node;
+
+  node = plist_dict_get_item(dict, key);
+
+  if (!node)
+    return -1;
+
+  if (plist_get_node_type(node) != PLIST_ARRAY)
+    return -1;
+
+  *val = node;
+
+  return 0;
+}
+
+
+/* We don't actually check anything (yet) despite the name */
+static int
+check_meta(plist_t dict)
+{
+  char *appver;
+  char *folder;
+  uint64_t major;
+  uint64_t minor;
+  int ret;
+
+  ret = get_dictval_int_from_key(dict, "Major Version", &major);
+  if (ret < 0)
+    return -1;
+
+  ret = get_dictval_int_from_key(dict, "Minor Version", &minor);
+  if (ret < 0)
+    return -1;
+
+  ret = get_dictval_string_from_key(dict, "Application Version", &appver);
+  if (ret < 0)
+    return -1;
+
+  ret = get_dictval_string_from_key(dict, "Music Folder", &folder);
+  if (ret < 0)
+    {
+      free(appver);
+      return -1;
+    }
+
+  DPRINTF(E_INFO, L_SCAN, "iTunes XML playlist Major:%" PRIu64 " Minor:%" PRIu64
+	  " Application:%s Folder:%s\n", major, minor, appver, folder);
+
+  free(appver);
+  free(folder);
+
+  return 0;
+}
+
+
+/* Best-effort attempt at locating the file:
+ *  - first exact location given in itml
+ *  - somewhere under the location of itml
+ *  - anywhere (filename only)
+ */
+static int
+find_track_file(char *location, char *base)
+{
+  char *filename;
+  int plen;
+  int mfi_id;
+
+  location = evhttp_decode_uri(location);
+
+  plen = strlen("file://localhost/");
+
+  /* Not a local file ... */
+  if (strncmp(location, "file://localhost/", plen) != 0)
+    return 0;
+
+  /* Windows pathspec, from iTunes Win32 */
+  if (location[plen + 1] == ':')
+    plen += 2;
+  else
+    plen -= 1;
+
+  /* Try exact path first */
+  filename = realpath(location + plen, NULL);
+  if (filename)
+    {
+      mfi_id = db_file_id_bypath(filename);
+
+      free(filename);
+
+      if (mfi_id > 0)
+	{
+	  free(location);
+
+	  return mfi_id;
+	}
+    }
+
+  filename = strrchr(location, '/');
+  if (!filename)
+    {
+      DPRINTF(E_WARN, L_SCAN, "Could not extract filename from location\n");
+
+      free(location);
+      return 0;
+    }
+
+  filename++;
+
+  /* Try to locate the file under the playlist location */
+  mfi_id = db_file_id_byfilebase(filename, base);
+  if (mfi_id > 0)
+    {
+      free(location);
+
+      return mfi_id;
+    }
+
+  /* Last resort, filename only */
+  mfi_id = db_file_id_byfile(filename);
+
+  free(location);
+
+  return mfi_id;
+}
+
+static int
+process_track_file(plist_t trk, char *base)
+{
+  char *location;
+  struct media_file_info *mfi;
+  char *string;
+  uint64_t integer;
+  char **strval;
+  uint32_t *intval;
+  char *chrval;
+  uint8_t boolean;
+  int mfi_id;
+  int i;
+  int ret;
+
+  ret = get_dictval_string_from_key(trk, "Location", &location);
+  if (ret < 0)
+    {
+      DPRINTF(E_WARN, L_SCAN, "Track type File with no Location\n");
+
+      return 0;
+    }
+
+  mfi_id = find_track_file(location, base);
+
+  if (mfi_id <= 0)
+    {
+      DPRINTF(E_INFO, L_SCAN, "Could not match location '%s' to any known file\n", location);
+
+      free(location);
+      return 0;
+    }
+
+  free(location);
+
+  if (!cfg_getbool(cfg_getnsec(cfg, "library", 0), "itunes_overrides"))
+    return mfi_id;
+
+  /* Override our metadata with what's provided by iTunes */
+  mfi = db_file_fetch_byid(mfi_id);
+  if (!mfi)
+    {
+      DPRINTF(E_LOG, L_SCAN, "Could not retrieve file info for file id %d\n", mfi_id);
+
+      return mfi_id;
+    }
+
+  for (i = 0; md_map[i].key != NULL; i++)
+    {
+      switch (md_map[i].type)
+	{
+	  case PLIST_UINT:
+	    ret = get_dictval_int_from_key(trk, md_map[i].key, &integer);
+	    if (ret < 0)
+	      break;
+
+	    intval = (uint32_t *) ((char *) mfi + md_map[i].offset);
+
+	    *intval = (uint32_t)integer;
+	    break;
+
+	  case PLIST_STRING:
+	    ret = get_dictval_string_from_key(trk, md_map[i].key, &string);
+	    if (ret < 0)
+	      break;
+
+	    strval = (char **) ((char *) mfi + md_map[i].offset);
+
+	    if (*strval)
+	      free(*strval);
+
+	    *strval = string;
+	    break;
+
+	  case PLIST_BOOLEAN:
+	    ret = get_dictval_bool_from_key(trk, md_map[i].key, &boolean);
+	    if (ret < 0)
+	      break;
+
+	    chrval = (char *) mfi + md_map[i].offset;
+
+	    *chrval = boolean;
+	    break;
+
+	  case PLIST_DATE:
+	    intval = (uint32_t *) ((char *) mfi + md_map[i].offset);
+
+	    get_dictval_date_from_key(trk, md_map[i].key, intval);
+	    break;
+
+	  default:
+	    DPRINTF(E_WARN, L_SCAN, "Unhandled metadata type %d\n", md_map[i].type);
+	    break;
+	}
+    }
+
+  db_file_update(mfi);
+
+  free_mfi(mfi, 0);
+
+  return mfi_id;
+}
+
+static int
+process_track_stream(plist_t trk)
+{
+  char *url;
+  int ret;
+
+  ret = get_dictval_string_from_key(trk, "Location", &url);
+  if (ret < 0)
+    {
+      DPRINTF(E_WARN, L_SCAN, "Track type URL with no Location entry!\n");
+
+      return 0;
+    }
+
+  ret = db_file_id_byurl(url);
+
+  free(url);
+
+  return ret;
+}
+
+static int
+process_tracks(plist_t tracks, char *base)
+{
+  plist_t trk;
+  plist_dict_iter iter;
+  struct itml_to_db_map *map;
+  avl_node_t *mapnode;
+  char *str;
+  uint64_t trk_id;
+  uint8_t disabled;
+  int ntracks;
+  int mfi_id;
+  int ret;
+
+  if (plist_dict_get_size(tracks) == 0)
+    {
+      DPRINTF(E_WARN, L_SCAN, "No tracks in iTunes library\n");
+      return 0;
+    }
+
+  ntracks = 0;
+
+  iter = NULL;
+  plist_dict_new_iter(tracks, &iter);
+
+  plist_dict_next_item(tracks, iter, NULL, &trk);
+  while (trk)
+    {
+      if (plist_get_node_type(trk) != PLIST_DICT)
+	{
+	  plist_dict_next_item(tracks, iter, NULL, &trk);
+	  continue;
+	}
+
+      ret = get_dictval_int_from_key(trk, "Track ID", &trk_id);
+      if (ret < 0)
+	{
+	  DPRINTF(E_WARN, L_SCAN, "Track ID not found!\n");
+
+	  plist_dict_next_item(tracks, iter, NULL, &trk);
+	  continue;
+	}
+
+      ret = get_dictval_bool_from_key(trk, "Disabled", &disabled);
+      if (ret < 0)
+	{
+	  DPRINTF(E_WARN, L_SCAN, "Malformed track record (id %" PRIu64 ")\n", trk_id);
+
+	  plist_dict_next_item(tracks, iter, NULL, &trk);
+	  continue;
+	}
+
+      if (disabled)
+	{
+	  DPRINTF(E_INFO, L_SCAN, "Track %" PRIu64 " disabled; skipping\n", trk_id);
+
+	  plist_dict_next_item(tracks, iter, NULL, &trk);
+	  continue;
+	}
+
+      ret = get_dictval_string_from_key(trk, "Track Type", &str);
+      if (ret < 0)
+	{
+	  DPRINTF(E_WARN, L_SCAN, "Track %" PRIu64 " has no track type\n", trk_id);
+
+	  plist_dict_next_item(tracks, iter, NULL, &trk);
+	  continue;
+	}
+
+      if (strcmp(str, "URL") == 0)
+	mfi_id = process_track_stream(trk);
+      else if (strcmp(str, "File") == 0)
+	mfi_id = process_track_file(trk, base);
+      else
+	{
+	  DPRINTF(E_LOG, L_SCAN, "Unknown track type: %s\n", str);
+
+	  free(str);
+	  plist_dict_next_item(tracks, iter, NULL, &trk);
+	  continue;
+	}
+
+      free(str);
+
+      if (mfi_id <= 0)
+	{
+	  plist_dict_next_item(tracks, iter, NULL, &trk);
+	  continue;
+	}
+
+      ntracks++;
+
+      map = (struct itml_to_db_map *)malloc(sizeof(struct itml_to_db_map));
+      if (!map)
+	{
+	  DPRINTF(E_WARN, L_SCAN, "Out of memory for itml -> db mapping\n");
+
+	  plist_dict_next_item(tracks, iter, NULL, &trk);
+	  continue;
+	}
+
+      map->itml_id = trk_id;
+      map->db_id = mfi_id;
+
+      mapnode = avl_insert(itml_to_db, map);
+      if (!mapnode)
+	{
+	  if (errno == EEXIST)
+	    DPRINTF(E_WARN, L_SCAN, "Track %" PRIu64 " already in itml -> db map?!\n");
+	  else
+	    DPRINTF(E_WARN, L_SCAN, "Track %" PRIu64 ": AVL insert error: %s\n", strerror(errno));
+
+	  free(map);
+	}
+
+      plist_dict_next_item(tracks, iter, NULL, &trk);
+    }
+
+  free(iter);
+
+  return ntracks;
+}
+
+
+static void
+process_pl_items(plist_t items, int pl_id)
+{
+  struct itml_to_db_map needle;
+  struct itml_to_db_map *map;
+  plist_t trk;
+  avl_node_t *mapnode;
+  uint32_t alen;
+  uint32_t i;
+  int ret;
+
+  alen = plist_array_get_size(items);
+  for (i = 0; i < alen; i++)
+    {
+      trk = plist_array_get_item(items, i);
+
+      if (plist_get_node_type(trk) != PLIST_DICT)
+	continue;
+
+      ret = get_dictval_int_from_key(trk, "Track ID", &needle.itml_id);
+      if (ret < 0)
+	{
+	  DPRINTF(E_WARN, L_SCAN, "No Track ID found for playlist item %u\n", i);
+	  continue;
+	}
+
+      mapnode = avl_search(itml_to_db, &needle);
+      if (!mapnode)
+	{
+	  DPRINTF(E_INFO, L_SCAN, "Track ID %" PRIu64 " dropped\n", needle.itml_id);
+	  continue;
+	}
+
+      map = (struct itml_to_db_map *)mapnode->item;
+
+      ret = db_pl_add_item_byid(pl_id, map->db_id);
+      if (ret < 0)
+	DPRINTF(E_WARN, L_SCAN, "Could not add ID %d to playlist\n", map->db_id);
+    }
+}
+
+static int 
+ignore_pl(plist_t pl, char *name)
+{
+  uint64_t kind;
+  int smart;
+  uint8_t master;
+  uint8_t party;
+
+  kind = 0;
+  smart = 0;
+  master = 0;
+  party = 0;
+
+  /* Special (builtin) playlists */
+  get_dictval_int_from_key(pl, "Distinguished Kind", &kind);
+
+  /* If only we could recover the smart playlists ... */
+  if (plist_dict_get_item(pl, "Smart Info")
+      || plist_dict_get_item(pl, "Smart Criteria"))
+    smart = 1;
+
+  /* Not interested in the Master playlist */
+  get_dictval_bool_from_key(pl, "Master", &master);
+  /* Not interested in Party Shuffle playlists */
+  get_dictval_bool_from_key(pl, "Party Shuffle", &party);
+
+  if ((kind > 0) || smart || party || master)
+    {
+      DPRINTF(E_INFO, L_SCAN, "Ignoring playlist '%s' (k %" PRIu64 " s%d p%d m%d)\n", name, kind, smart, party, master);
+
+      return 1;
+    }
+
+  return 0;
+}
+
+static void
+process_pls(plist_t playlists, char *file)
+{
+  plist_t pl;
+  plist_t items;
+  struct playlist_info *pli;
+  char *name;
+  uint64_t id;
+  int pl_id;
+  uint32_t alen;
+  uint32_t i;
+  int ret;
+
+  alen = plist_array_get_size(playlists);
+  for (i = 0; i < alen; i++)
+    {
+      pl = plist_array_get_item(playlists, i);
+
+      if (plist_get_node_type(pl) != PLIST_DICT)
+	continue;
+
+      ret = get_dictval_int_from_key(pl, "Playlist ID", &id);
+      if (ret < 0)
+	{
+	  DPRINTF(E_DBG, L_SCAN, "Playlist ID not found!\n");
+	  continue;
+	}
+
+      ret = get_dictval_string_from_key(pl, "Name", &name);
+      if (ret < 0)
+	{
+	  DPRINTF(E_DBG, L_SCAN, "Name not found!\n");
+	  continue;
+	}
+
+      if (ignore_pl(pl, name))
+	{
+	  free(name);
+	  continue;
+	}
+
+      pli = db_pl_fetch_bytitlepath(name, file);
+
+      if (pli)
+	{
+	  pl_id = pli->id;
+
+	  free_pli(pli, 0);
+
+	  db_pl_ping(pl_id);
+	  db_pl_clear_items(pl_id);
+	}
+      else
+	pl_id = 0;
+
+      ret = get_dictval_array_from_key(pl, "Playlist Items", &items);
+      if (ret < 0)
+	{
+	  DPRINTF(E_INFO, L_SCAN, "Playlist '%s' has no items\n", name);
+
+	  free(name);
+	  continue;
+	}
+
+      if (pl_id == 0)
+	{
+	  ret = db_pl_add(name, file, &pl_id);
+	  if (ret < 0)
+	    {
+	      DPRINTF(E_LOG, L_SCAN, "Error adding iTunes playlist '%s' (%s)\n", name, file);
+
+	      free(name);
+	      continue;
+	    }
+
+	  DPRINTF(E_INFO, L_SCAN, "Added playlist as id %d\n", pl_id);
+	}
+
+      free(name);
+
+      process_pl_items(items, pl_id);
+    }
+}
+
+
+void
+scan_itunes_itml(char *file)
+{
+  struct stat sb;
+  char *itml_xml;
+  char *ptr;
+  plist_t itml;
+  plist_t node;
+  int fd;
+  int ret;
+
+  DPRINTF(E_INFO, L_SCAN, "Processing iTunes library: %s\n", file);
+
+  fd = open(file, O_RDONLY);
+  if (fd < 0)
+    {
+      DPRINTF(E_WARN, L_SCAN, "Could not open iTunes library '%s': %s\n", file, strerror(errno));
+
+      return;
+    }
+
+  ret = fstat(fd, &sb);
+  if (ret < 0)
+    {
+      DPRINTF(E_WARN, L_SCAN, "Could not stat iTunes library '%s': %s\n", file, strerror(errno));
+
+      close(fd);
+      return;
+    }
+
+  itml_xml = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
+  if (itml_xml == MAP_FAILED)
+    {
+      DPRINTF(E_WARN, L_SCAN, "Could not map iTunes library: %s\n", strerror(errno));
+
+      close(fd);
+      return;
+    }
+
+  itml = NULL;
+  plist_from_xml(itml_xml, sb.st_size, &itml);
+
+  ret = munmap(itml_xml, sb.st_size);
+  if (ret < 0)
+    DPRINTF(E_LOG, L_SCAN, "Could not unmap iTunes library: %s\n", strerror(errno));
+
+  close(fd);
+
+  if (!itml)
+    {
+      DPRINTF(E_WARN, L_SCAN, "iTunes XML playlist '%s' failed to parse\n", file);
+
+      return;
+    }
+
+  if (plist_get_node_type(itml) != PLIST_DICT)
+    {
+      DPRINTF(E_WARN, L_SCAN, "Malformed iTunes XML playlist '%s'\n", file);
+
+      plist_free(itml);
+      return;
+    }
+
+  /* Meta data */
+  ret = check_meta(itml);
+  if (ret < 0)
+    {
+      plist_free(itml);
+      return;
+    }
+
+  /* Tracks */
+  ret = get_dictval_dict_from_key(itml, "Tracks", &node);
+  if (ret < 0)
+    {
+      DPRINTF(E_WARN, L_SCAN, "Could not find Tracks dict\n");
+
+      plist_free(itml);
+      return;
+    }
+
+  itml_to_db = avl_alloc_tree(itml_to_db_compare, NULL);
+  if (!itml_to_db)
+    {
+      DPRINTF(E_FATAL, L_SCAN, "iTunes library parser could not allocate AVL tree\n");
+
+      plist_free(itml);
+      return;
+    }
+
+  ptr = strrchr(file, '/');
+  if (!ptr)
+    {
+      DPRINTF(E_FATAL, L_SCAN, "Invalid filename\n");
+
+      avl_free_tree(itml_to_db);
+      plist_free(itml);
+      return;
+    }
+
+  *ptr = '\0';
+
+  ret = process_tracks(node, file);
+  if (ret <= 0)
+    {
+      DPRINTF(E_WARN, L_SCAN, "No tracks loaded\n");
+
+      avl_free_tree(itml_to_db);
+      plist_free(itml);
+      return;
+    }
+
+  *ptr = '/';
+
+  DPRINTF(E_INFO, L_SCAN, "Loaded %d tracks from iTunes library\n", ret);
+
+  /* Playlists */
+  ret = get_dictval_array_from_key(itml, "Playlists", &node);
+  if (ret < 0)
+    {
+      DPRINTF(E_WARN, L_SCAN, "Could not find Playlists dict\n");
+
+      avl_free_tree(itml_to_db);
+      plist_free(itml);
+      return;
+    }
+
+  process_pls(node, file);
+
+  avl_free_tree(itml_to_db);
+  plist_free(itml);
+}