diff --git a/vagalume/Makefile b/vagalume/Makefile
index 2121f642ad..3fc5302cc9 100644
--- a/vagalume/Makefile
+++ b/vagalume/Makefile
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/06/13 22:47:21 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.7 2011/07/07 20:43:58 roelants Exp $
 #
 
-DISTNAME=	vagalume_${VERSION}.orig
-PKGNAME=	vagalume-${VERSION}
-VERSION=	0.7.1
-PKGREVISION=	2
+DISTNAME=	vagalume-0.8.5
 CATEGORIES=	audio net
 MASTER_SITES=	http://vagalume.igalia.com/files/source/
 
@@ -15,10 +12,9 @@ LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/vagalume-${VERSION}.orig
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake msgfmt pkg-config
+USE_TOOLS+=	gmake intltool msgfmt pkg-config
 
 BUILDLINK_API_DEPENDS.libnotify+=	libnotify>=0.4.1
 
diff --git a/vagalume/PLIST b/vagalume/PLIST
index 598798f474..e96e5e863c 100644
--- a/vagalume/PLIST
+++ b/vagalume/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/01 14:47:24 roelants Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/07/07 20:43:58 roelants Exp $
 bin/vagalume
 bin/vagalumectl
 man/man1/vagalume.1
@@ -6,6 +6,7 @@ man/man1/vagalumectl.1
 share/applications/vagalume.desktop
 share/dbus-1/services/vagalume.service
 share/icons/hicolor/48x48/apps/vagalume.png
+share/locale/ca/LC_MESSAGES/vagalume.mo
 share/locale/de/LC_MESSAGES/vagalume.mo
 share/locale/es/LC_MESSAGES/vagalume.mo
 share/locale/fi/LC_MESSAGES/vagalume.mo
@@ -13,16 +14,19 @@ share/locale/fr/LC_MESSAGES/vagalume.mo
 share/locale/gl/LC_MESSAGES/vagalume.mo
 share/locale/it/LC_MESSAGES/vagalume.mo
 share/locale/lv/LC_MESSAGES/vagalume.mo
+share/locale/pl/LC_MESSAGES/vagalume.mo
 share/locale/pt/LC_MESSAGES/vagalume.mo
 share/locale/pt_BR/LC_MESSAGES/vagalume.mo
+share/locale/ru/LC_MESSAGES/vagalume.mo
 share/pixmaps/vagalume.xpm
 share/vagalume/cover.png
-share/vagalume/icons/hicolor/scalable/actions/accessories-text-editor.svg
-share/vagalume/icons/hicolor/scalable/actions/document-save.svg
-share/vagalume/icons/hicolor/scalable/actions/emblem-favorite.svg
-share/vagalume/icons/hicolor/scalable/actions/list-add.svg
-share/vagalume/icons/hicolor/scalable/actions/mail-message-new.svg
-share/vagalume/icons/hicolor/scalable/actions/media-playback-start.svg
-share/vagalume/icons/hicolor/scalable/actions/media-playback-stop.svg
-share/vagalume/icons/hicolor/scalable/actions/media-skip-forward.svg
-share/vagalume/icons/hicolor/scalable/actions/process-stop.svg
+share/vagalume/icons/hicolor/scalable/apps/accessories-text-editor.svg
+share/vagalume/icons/hicolor/scalable/apps/document-save.svg
+share/vagalume/icons/hicolor/scalable/apps/emblem-favorite.svg
+share/vagalume/icons/hicolor/scalable/apps/list-add.svg
+share/vagalume/icons/hicolor/scalable/apps/mail-message-new.svg
+share/vagalume/icons/hicolor/scalable/apps/media-playback-start.svg
+share/vagalume/icons/hicolor/scalable/apps/media-playback-stop.svg
+share/vagalume/icons/hicolor/scalable/apps/media-skip-forward.svg
+share/vagalume/icons/hicolor/scalable/apps/process-stop.svg
+share/vagalume/servers.xml
diff --git a/vagalume/distinfo b/vagalume/distinfo
index bd1ebd6d72..010a810396 100644
--- a/vagalume/distinfo
+++ b/vagalume/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/02/27 07:46:17 roelants Exp $
+$NetBSD: distinfo,v 1.3 2011/07/07 20:43:58 roelants Exp $
 
-SHA1 (vagalume_0.7.1.orig.tar.gz) = b55de63ad1c29aee02fe90d0537fc19c15b19c49
-RMD160 (vagalume_0.7.1.orig.tar.gz) = 1d6dd5f9a3d065b285d59a47f73bd5d9a6542dc3
-Size (vagalume_0.7.1.orig.tar.gz) = 604281 bytes
+SHA1 (vagalume-0.8.5.tar.gz) = ef0c3bc4e62d5a8195ec7ac4f53f17afc00e8cc2
+RMD160 (vagalume-0.8.5.tar.gz) = 6207b6df89dc5c2b801da2ac0c444d7fda7acc8b
+Size (vagalume-0.8.5.tar.gz) = 765345 bytes