diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 57ce0c9a5e7..47d1a58d5e9 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.26 2007/12/15 18:56:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2007/12/31 18:35:42 ckuethe Exp $
 
 COMMENT=	GTK+2 program to synchronize an Apple iPod
-DISTNAME=	gtkpod-0.99.10
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	gtkpod-0.99.12
 CATEGORIES=	audio x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkpod/}
 
diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo
index dc3ddc2bbd1..bcad9184e6c 100644
--- a/audio/gtkpod/distinfo
+++ b/audio/gtkpod/distinfo
@@ -1,5 +1,5 @@
-MD5 (gtkpod-0.99.10.tar.gz) = y8LQNYWq9BkV4mx8g6rUEg==
-RMD160 (gtkpod-0.99.10.tar.gz) = maBqnluMrR48G0iiIClvF5bLqPY=
-SHA1 (gtkpod-0.99.10.tar.gz) = NQpRzk6Nrk65wvIkeZBE+qqY8+A=
-SHA256 (gtkpod-0.99.10.tar.gz) = zY7CJYqj53TvH3QxF93Ibn2JvD9A/ANJK3sIk/lmns4=
-SIZE (gtkpod-0.99.10.tar.gz) = 1068561
+MD5 (gtkpod-0.99.12.tar.gz) = ExYqfpkSAokiqvz4HZCDlA==
+RMD160 (gtkpod-0.99.12.tar.gz) = 3kHUqzyQdBbojoH7x5yh2CQRxMQ=
+SHA1 (gtkpod-0.99.12.tar.gz) = q3wD7hqHX+K6uVPVgFoqTWX81mk=
+SHA256 (gtkpod-0.99.12.tar.gz) = z4zJGwpOgXukcMPVaxlgSMKjjvUMmluILq3dX0Dpwzs=
+SIZE (gtkpod-0.99.12.tar.gz) = 1218052
diff --git a/audio/gtkpod/patches/patch-src_file_itunesdb_c b/audio/gtkpod/patches/patch-src_file_itunesdb_c
index cee03b11f20..f208e146855 100644
--- a/audio/gtkpod/patches/patch-src_file_itunesdb_c
+++ b/audio/gtkpod/patches/patch-src_file_itunesdb_c
@@ -1,4 +1,4 @@
-$OpenBSD: patch-src_file_itunesdb_c,v 1.3 2007/11/22 22:46:42 ckuethe Exp $
+$OpenBSD: patch-src_file_itunesdb_c,v 1.4 2007/12/31 18:35:42 ckuethe Exp $
 --- src/file_itunesdb.c.orig	Wed Jun 27 13:29:33 2007
 +++ src/file_itunesdb.c	Sun Nov 18 11:19:49 2007
 @@ -563,7 +563,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi
@@ -90,3 +90,17 @@ $OpenBSD: patch-src_file_itunesdb_c,v 1.3 2007/11/22 22:46:42 ckuethe Exp $
  
      if (old_itdb->usertype & GP_ITDB_TYPE_LOCAL)
      {
+@@ -880,8 +880,11 @@ iTunesDB *gp_load_ipod (iTunesDB *itdb)
+           ok_to_load = FALSE;
+       }
+     }
+-    g_free (itunesdb);
+-    g_free (mountpoint);
++    else
++    {
++      g_free (itunesdb);
++      g_free (mountpoint);
++    }
+
+     if (ok_to_load)
+     {
diff --git a/audio/gtkpod/pkg/PLIST b/audio/gtkpod/pkg/PLIST
index 5eba20ab74d..5faf3fc9da0 100644
--- a/audio/gtkpod/pkg/PLIST
+++ b/audio/gtkpod/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2007/12/15 18:56:35 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.7 2007/12/31 18:35:42 ckuethe Exp $
 bin/gtkpod
 share/applications/
 share/applications/gtkpod.desktop
@@ -7,6 +7,13 @@ share/gtkpod/data/
 share/gtkpod/data/cdshine.png
 share/gtkpod/data/cdshine_main.png
 share/gtkpod/data/default-cover.png
+share/gtkpod/data/gphoto_album_menuitem-32.png
+share/gtkpod/data/gphoto_album_menuitem-48.png
+share/gtkpod/data/gphoto_images_menuitem-32.png
+share/gtkpod/data/gphoto_images_menuitem-48.png
+share/gtkpod/data/gphoto_playlist_icon-48.png
+share/gtkpod/data/gphoto_tools_menuitem-32.png
+share/gtkpod/data/gphoto_tools_menuitem-48.png
 share/gtkpod/data/gtkpod-add-dirs.png
 share/gtkpod/data/gtkpod-add-files.png
 share/gtkpod/data/gtkpod-add-playlists.png
@@ -15,18 +22,15 @@ share/gtkpod/data/gtkpod-icon-32.png
 share/gtkpod/data/gtkpod-icon-48.png
 share/gtkpod/data/gtkpod-logo.png
 share/gtkpod/data/gtkpod-new-playlist.png
+share/gtkpod/data/gtkpod-read-16.png
 share/gtkpod/data/gtkpod-read.png
 share/gtkpod/data/gtkpod-sync.png
 share/gtkpod/data/gtkpod.glade
+share/gtkpod/data/tunes_playlist_icon-48.png
 share/gtkpod/scripts/
-share/gtkpod/scripts/convert-flac2m4a.sh
-share/gtkpod/scripts/convert-flac2mp3.sh
-share/gtkpod/scripts/convert-m4a2mp3.sh
-share/gtkpod/scripts/convert-mp32m4a.sh
-share/gtkpod/scripts/convert-ogg2m4a.sh
-share/gtkpod/scripts/convert-ogg2mp3.sh
-share/gtkpod/scripts/convert-wav2m4a.sh
-share/gtkpod/scripts/convert-wav2mp3.sh
+share/gtkpod/scripts/convert-2m4a.sh
+share/gtkpod/scripts/convert-2mp3.sh
+share/gtkpod/scripts/gtkpod-convert-common.sh
 share/gtkpod/scripts/ldif2vcf.sh
 share/gtkpod/scripts/mab2vcard
 share/gtkpod/scripts/sync-abook.sh
@@ -59,6 +63,8 @@ share/locale/fr/LC_MESSAGES/gtkpod.mo
 share/locale/he/LC_MESSAGES/gtkpod.mo
 share/locale/it/LC_MESSAGES/gtkpod.mo
 share/locale/ja/LC_MESSAGES/gtkpod.mo
+share/locale/ro/LC_MESSAGES/gtkpod.mo
+share/locale/ru/LC_MESSAGES/gtkpod.mo
 share/locale/sv/LC_MESSAGES/gtkpod.mo
 @exec %D/bin/update-desktop-database
 @unexec %D/bin/update-desktop-database