diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile
index 837f1d7e441..4d8a3c38941 100644
--- a/audio/tagtool/Makefile
+++ b/audio/tagtool/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.4 2007/04/12 20:24:30 sturm Exp $
+# $OpenBSD: Makefile,v 1.5 2007/06/01 18:48:46 jasper Exp $
 
 COMMENT=	"Ogg Vorbis and MP3 files tagger"
 
-DISTNAME=	tagtool-0.12.2
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	tagtool-0.12.3
 CATEGORIES=	audio
 HOMEPAGE=	http://pwp.netcabo.pt/paol/tagtool/
 
 MAINTAINER=	Vlad Glagolev <stelzy@gmail.com>
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tagtool/}
+EXTRACT_SUFX=	.tar.bz2
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -17,9 +17,10 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	X11 Xau Xdmcp Xrender atk-1.0 c m z stdc++ ogg fontconfig \
+WANTLIB=	X11 Xau Xdmcp Xrender Xcursor Xext Xfixes Xi Xinerama Xrandr \
+		atk-1.0 c m z stdc++ ogg fontconfig cairo xml2 \
 		freetype expat glib-2.0 gmodule-2.0 glitz png \
-		gobject-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 cairo
+		gobject-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0
 
 MODULES=	devel/gettext
 
@@ -27,10 +28,10 @@ BUILD_DEPENDS=	:p5-XML-Parser-*:textproc/p5-XML-Parser
 
 LIB_DEPENDS=	id3.>=3.8::audio/id3lib \
 		vorbis.>=5.0::audio/libvorbis \
-		gtk-x11-2.0.>=0.14,gdk-x11-2.0.>=0.14,gdk_pixbuf-2.0.>=0.14::x11/gtk+2 \
+		gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0:gtk+2->=2.10:x11/gtk+2 \
 		glade-2.0.>=0.3::devel/libglade2 \
-		vorbisfile.>=4::audio/libvorbis \
-		xml2.>=9::textproc/libxml
+		vorbisfile.>=4::audio/libvorbis
+RUN_DEPENDS=	::x11/hicolor-icon-theme
 
 CONFIGURE_STYLE=gnu
 
diff --git a/audio/tagtool/distinfo b/audio/tagtool/distinfo
index e298f3cfca5..fba24b70b55 100644
--- a/audio/tagtool/distinfo
+++ b/audio/tagtool/distinfo
@@ -1,5 +1,5 @@
-MD5 (tagtool-0.12.2.tar.gz) = TWiNu+fNigip+frvTRxbJw==
-RMD160 (tagtool-0.12.2.tar.gz) = ggySKDXixIUlbWT7yoDYzZd47WI=
-SHA1 (tagtool-0.12.2.tar.gz) = KPUCNWAK3RQLKOvyoaxU5KZ/r8k=
-SHA256 (tagtool-0.12.2.tar.gz) = xrOe2ObQsBmdNCI0XmhFoc7/od3VTMsUnxgT+fZC/z8=
-SIZE (tagtool-0.12.2.tar.gz) = 368758
+MD5 (tagtool-0.12.3.tar.bz2) = RHs6UF/uaKgvJdzak3e2dg==
+RMD160 (tagtool-0.12.3.tar.bz2) = n1riI1gJSMQDzUTYLs7w0DBA/wk=
+SHA1 (tagtool-0.12.3.tar.bz2) = 5+1Ov4+Ygc84sjQLGOlZR/ZYMI4=
+SHA256 (tagtool-0.12.3.tar.bz2) = Jz9BAx3SrYDAnRhl/ccdkFKDGlzpzYxTcFzFGKnT1BE=
+SIZE (tagtool-0.12.3.tar.bz2) = 303743
diff --git a/audio/tagtool/patches/patch-src_Makefile_in b/audio/tagtool/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..ff41abf4234
--- /dev/null
+++ b/audio/tagtool/patches/patch-src_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2007/06/01 18:48:46 jasper Exp $
+--- src/Makefile.in.orig	Tue Feb 27 21:34:13 2007
++++ src/Makefile.in	Fri Jun  1 20:41:18 2007
+@@ -189,7 +189,7 @@ resource_DATA = tagtool.glade preferences.dtd
+ @ENABLE_VORBIS_FALSE@vorbis_cflags = 
+ @ENABLE_VORBIS_TRUE@vorbis_cflags = -DENABLE_VORBIS
+ 
+-tagtool_CFLAGS = -Wall -Wno-pointer-sign $(GTK_CFLAGS) ${mp3_cflags} 	\
++tagtool_CFLAGS = -Wall $(GTK_CFLAGS) ${mp3_cflags} 	\
+ 	${vorbis_cflags} -DDATADIR='"$(datadir)/${PACKAGE_NAME}"'
+ 
+ 
diff --git a/audio/tagtool/pkg/PLIST b/audio/tagtool/pkg/PLIST
index d235ff0b19f..5fb564ae5bd 100644
--- a/audio/tagtool/pkg/PLIST
+++ b/audio/tagtool/pkg/PLIST
@@ -1,7 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/12/10 21:55:11 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2007/06/01 18:48:46 jasper Exp $
 bin/tagtool
 share/applications/
 share/applications/tagtool.desktop
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/48x48/
+share/icons/hicolor/48x48/apps/
+share/icons/hicolor/48x48/apps/TagTool.png
+share/icons/hicolor/scalable/
+share/icons/hicolor/scalable/apps/
+share/icons/hicolor/scalable/apps/TagTool.svg
 share/locale/bg/LC_MESSAGES/tagtool.mo
 share/locale/cs/LC_MESSAGES/tagtool.mo
 share/locale/de/LC_MESSAGES/tagtool.mo
@@ -14,13 +22,15 @@ share/locale/it/LC_MESSAGES/tagtool.mo
 share/locale/lt/
 share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/tagtool.mo
+share/locale/nl/LC_MESSAGES/tagtool.mo
+share/locale/pl/LC_MESSAGES/tagtool.mo
 share/locale/pt/LC_MESSAGES/tagtool.mo
+share/locale/pt_BR/LC_MESSAGES/tagtool.mo
 share/locale/ru/LC_MESSAGES/tagtool.mo
+share/locale/sv/LC_MESSAGES/tagtool.mo
 share/locale/ua/
 share/locale/ua/LC_MESSAGES/
 share/locale/ua/LC_MESSAGES/tagtool.mo
-share/pixmaps/
-share/pixmaps/TagTool.png
 share/tagtool/
 share/tagtool/TagTool.png
 share/tagtool/edit.png
@@ -39,3 +49,5 @@ share/tagtool/tab_rename.png
 share/tagtool/tab_tag.png
 share/tagtool/tagtool.glade
 share/tagtool/warn.png
+@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor
+@unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor