diff --git a/x11/gnome/audio/Makefile b/x11/gnome/audio/Makefile
index e20a223267d..42a2274d5e5 100644
--- a/x11/gnome/audio/Makefile
+++ b/x11/gnome/audio/Makefile
@@ -1,14 +1,15 @@
-# $OpenBSD: Makefile,v 1.4 2008/02/04 17:55:18 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2008/11/21 17:52:11 jasper Exp $
 
 COMMENT=		audio files for Gnome
 
 GNOME_PROJECT=		gnome-audio
-GNOME_VERSION=		2.0.0
-PKGNAME=		${DISTNAME}p0
+GNOME_VERSION=		2.22.2
 
 MODULES=		x11/gnome
 
-# LGPL
+# Creative Commons ShareAlike 2.0
+# Creative Commons - Attribution-Share Alike 2.0 Generic
+# Creative Commons - Attribution 3.0 Unported
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
@@ -17,4 +18,6 @@ PERMIT_DISTFILES_FTP=	Yes
 NO_BUILD=		Yes
 NO_REGRESS=		Yes
 
+FAKE_FLAGS+=		datadir="${TRUEPREFIX}/share"
+
 .include <bsd.port.mk>
diff --git a/x11/gnome/audio/distinfo b/x11/gnome/audio/distinfo
index f231b4362ce..5f419c2091a 100644
--- a/x11/gnome/audio/distinfo
+++ b/x11/gnome/audio/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/gnome-audio-2.0.0.tar.bz2) = zRS4SvWfsuxnNSfTL043nw==
-RMD160 (gnome/gnome-audio-2.0.0.tar.bz2) = kLqv/ZrFFZzlhRCUrZBp1R3qlZI=
-SHA1 (gnome/gnome-audio-2.0.0.tar.bz2) = SI9ileLh9UqJiN1+catnPNf8igA=
-SHA256 (gnome/gnome-audio-2.0.0.tar.bz2) = sVh7cgBW9EwsRy8RV/pzsQp//g/S9ozxBbObk7zygPg=
-SIZE (gnome/gnome-audio-2.0.0.tar.bz2) = 1401319
+MD5 (gnome/gnome-audio-2.22.2.tar.bz2) = UdSlC4knzIpMxSzuSY6dAQ==
+RMD160 (gnome/gnome-audio-2.22.2.tar.bz2) = knz3h/96amnMx9Mj+C3d/R3VolM=
+SHA1 (gnome/gnome-audio-2.22.2.tar.bz2) = iLw4OHp7VW6zIjL0FI/Qmr1Zq20=
+SHA256 (gnome/gnome-audio-2.22.2.tar.bz2) = L4cPgiNg0i2FdUjlSbYAynRRHgYHVOHcqOP47EAhDIw=
+SIZE (gnome/gnome-audio-2.22.2.tar.bz2) = 1743759
diff --git a/x11/gnome/audio/patches/patch-sounds_Makefile b/x11/gnome/audio/patches/patch-sounds_Makefile
index b14eec91320..5fd7fab4d73 100644
--- a/x11/gnome/audio/patches/patch-sounds_Makefile
+++ b/x11/gnome/audio/patches/patch-sounds_Makefile
@@ -1,24 +1,9 @@
-$OpenBSD: patch-sounds_Makefile,v 1.2 2007/05/31 11:43:06 jasper Exp $
---- sounds/Makefile.orig	Tue Jul  1 13:04:30 2003
-+++ sounds/Makefile	Thu May 31 13:38:16 2007
-@@ -1,5 +1,3 @@
--prefix=$(shell gnome-config --prefix)
--
+$OpenBSD: patch-sounds_Makefile,v 1.3 2008/11/21 17:52:11 jasper Exp $
+--- sounds/Makefile.orig	Tue May  6 16:39:14 2008
++++ sounds/Makefile	Tue Nov 18 21:43:08 2008
+@@ -1,4 +1,4 @@
+-datadir=/usr/share
++datadir?=/usr/share
+ 
  LN_S=ln -sf
  INSTALL_DATA=install -c -m 444 
- # Which one is more portable
-@@ -12,10 +10,10 @@ install: install-files install-default-links
- 
- install-files:
- 	for I in *.wav */*.wav ; do \
--		$(MKINSTALLDIRS) $(prefix)/share/sounds/`dirname $$I`; \
--		$(INSTALL_DATA) $$I $(prefix)/share/sounds/$$I; \
-+		$(MKINSTALLDIRS) $(PREFIX)/share/sounds/`dirname $$I`; \
-+		$(INSTALL_DATA) $$I $(PREFIX)/share/sounds/$$I; \
- 	done
- 
- install-default-links:
--	$(LN_S) startup3.wav $(prefix)/share/sounds/login.wav
--	$(LN_S) shutdown1.wav $(prefix)/share/sounds/logout.wav
-+	$(LN_S) startup3.wav $(PREFIX)/share/sounds/login.wav
-+	$(LN_S) shutdown1.wav $(PREFIX)/share/sounds/logout.wav