diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 5bec18e3155..f4bdaab0a39 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2002/12/29 19:29:56 fgsch Exp $
+# $OpenBSD: Makefile,v 1.9 2004/08/05 03:21:18 espie Exp $
 
 COMMENT=	"front-end to external cd audio rippers and mp3 encoders"
 
@@ -18,6 +18,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		http://www.nostatic.org/grip/
 
+MODULES=	devel/gettext
+
 LIB_DEPENDS=	gtk.1.2,gdk.1.2::x11/gtk+ \
 		gnome.36,gnomesupport.0,gnomeui.46,art_lgpl.4::x11/gnome/libs \
 		ghttp::www/libghttp \
diff --git a/audio/grip/patches/patch-doc_C_Makefile_in b/audio/grip/patches/patch-doc_C_Makefile_in
new file mode 100644
index 00000000000..19ee68df8f1
--- /dev/null
+++ b/audio/grip/patches/patch-doc_C_Makefile_in
@@ -0,0 +1,25 @@
+$OpenBSD: patch-doc_C_Makefile_in,v 1.1 2004/08/05 03:21:18 espie Exp $
+--- doc/C/Makefile.in.orig	Sat Apr 13 20:38:37 2002
++++ doc/C/Makefile.in	Thu Aug  5 05:12:06 2004
+@@ -121,7 +121,7 @@ ZVT_LIBS = @ZVT_LIBS@
+ cflags_set = @cflags_set@
+ cxxflags_set = @cxxflags_set@
+ 
+-grip_helpdir = $(DESTDIR)$(datadir)/gnome/help/grip/C
++grip_helpdir = $(datadir)/gnome/help/grip/C
+ 
+ grip_help_DATA = \
+         grip.html        \
+@@ -278,10 +278,10 @@ dist-hook:
+ 	-cp grip.html $(distdir)
+ 
+ install-data-local: grip.html
+-	$(mkinstalldirs) $(grip_helpdir)/images
++	$(mkinstalldirs) $(DESTDIR)$(grip_helpdir)/images
+ 	-for file in $(srcdir)/grip/*.html $(srcdir)/grip/*.css $(srcdir)/grip/*.png; do \
+ 	basefile=`basename $$file`; \
+-	$(INSTALL_DATA) $(srcdir)/$$file $(grip_helpdir)/$$basefile; \
++	$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(grip_helpdir)/$$basefile; \
+ 	done
+ 
+ grip.ps: grip.sgml
diff --git a/audio/grip/pkg/PLIST b/audio/grip/pkg/PLIST
index dcc77844294..ece6ec9afd5 100644
--- a/audio/grip/pkg/PLIST
+++ b/audio/grip/pkg/PLIST
@@ -1,6 +1,12 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/12/16 15:31:22 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/08/05 03:21:18 espie Exp $
 bin/grip
+share/gnome/
+share/gnome/apps/
+share/gnome/apps/Multimedia/
 share/gnome/apps/Multimedia/grip.desktop
+share/gnome/help/
+share/gnome/help/grip/
+share/gnome/help/grip/C/
 share/gnome/help/grip/C/acknowledge.html
 share/gnome/help/grip/C/bugs.html
 share/gnome/help/grip/C/cdconfig.png
@@ -22,6 +28,7 @@ share/gnome/help/grip/C/grip.html
 share/gnome/help/grip/C/gripswitches.html
 share/gnome/help/grip/C/id3config.html
 share/gnome/help/grip/C/id3config.png
+share/gnome/help/grip/C/images/
 share/gnome/help/grip/C/intro.html
 share/gnome/help/grip/C/license.html
 share/gnome/help/grip/C/ln14.html
@@ -65,16 +72,15 @@ share/gnome/help/grip/C/smile5.png
 share/gnome/help/grip/C/smile7.png
 share/gnome/help/grip/C/smile8.png
 share/gnome/help/grip/C/stop.png
+share/gnome/help/grip/C/topic.dat
 share/gnome/help/grip/C/trkedit.png
 share/gnome/help/grip/C/volume.png
 share/gnome/help/grip/C/x131.html
 share/locale/de/LC_MESSAGES/grip.mo
 share/locale/fr/LC_MESSAGES/grip.mo
 share/locale/ja/LC_MESSAGES/grip.mo
+share/locale/zh_CN/
+share/locale/zh_CN/LC_MESSAGES/
 share/locale/zh_CN/LC_MESSAGES/grip.mo
+share/pixmaps/
 share/pixmaps/gripicon.png
-@dirrm share/locale/zh_CN
-@dirrm share/gnome/help/grip/C
-@dirrm share/gnome/help/grip
-@dirrm share/gnome/apps/Multimedia
-@dirrm share/gnome/apps