diff --git a/audio/cantus_3/Makefile b/audio/cantus_3/Makefile
index 801bb4df5e98..eaffe45521f9 100644
--- a/audio/cantus_3/Makefile
+++ b/audio/cantus_3/Makefile
@@ -1,44 +1,42 @@
 # New ports collection makefile for:	cantus_3
 # Date created:				18 May 2004
 # Whom:					asa@gascom.ru
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cantus_3
 PORTVERSION=	3.0.0
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.gascom.ru/pub/asa/ \
 		http://web222.mis02.de/releases/cantus_3/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	asa@gascom.ru
 COMMENT=	Tool for tagging and renaming MP3 and OGG/Vorbis files
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 LIB_DEPENDS=	gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtk--2 \
 		glademm-2.0.1:${PORTSDIR}/devel/libglademm \
 		ogg.5:${PORTSDIR}/audio/libogg \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 
-BROKEN=		Incomplete pkg-plist
-
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libglade2
+USE_GNOME=	gnomehack gnomeprefix libglade2
 USE_X_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
 IGNORE=		Does not build on 4.X.
 .endif
 
 BASH?=		${LOCALBASE}/bin/bash
 
 do-build:
 	@cd ${WRKSRC} && ${BASH} build.sh --prefix '${PREFIX}'
 
 do-install:
 	@cd ${WRKSRC} && ${BASH} build.sh --install --prefix '${PREFIX}'
 
 .include <bsd.port.post.mk>
diff --git a/audio/cantus_3/files/patch-build.sh b/audio/cantus_3/files/patch-build.sh
index dbdee9110bde..a4422fd98d5b 100644
--- a/audio/cantus_3/files/patch-build.sh
+++ b/audio/cantus_3/files/patch-build.sh
@@ -1,15 +1,17 @@
---- build.sh.orig	Thu Apr 22 04:26:52 2004
-+++ build.sh	Tue May 18 14:57:02 2004
-@@ -165,11 +165,7 @@
+--- build.sh.orig	Wed Apr 21 20:26:52 2004
++++ build.sh	Mon Mar  7 12:11:44 2005
+@@ -164,12 +164,8 @@
+ INST_LIBDIR="$INST_PREFIX/lib/$EXECUTABLE"
  INST_LOCALEDIR="$INST_PREFIX/share/locale"
  INST_PIXMAPDIR="$INST_PREFIX/lib/$EXECUTABLE"
- INST_DOCDIR="$INST_PREFIX/doc/$EXECUTABLE"
+-INST_DOCDIR="$INST_PREFIX/doc/$EXECUTABLE"
 -if [ -d "/usr/share/gnome/help/" ]; then
 -  INST_GNOMEDOCDIR="/usr/share/gnome/help/$EXECUTABLE/C"
 -else
 -  INST_GNOMEDOCDIR="/usr/local/share/gnome/help/$EXECUTABLE/C"
 -fi
++INST_DOCDIR="$INST_PREFIX/share/doc/$EXECUTABLE"
 +INST_GNOMEDOCDIR="$INST_PREFIX/share/gnome/help/$EXECUTABLE/C"
  
  # Preprocessor macros:
  MACROS="PACKAGE_LIB_DIR=$INST_LIBDIR/\
diff --git a/audio/cantus_3/pkg-plist b/audio/cantus_3/pkg-plist
index 8e5d5a09125c..4e47af908f52 100644
--- a/audio/cantus_3/pkg-plist
+++ b/audio/cantus_3/pkg-plist
@@ -1,22 +1,23 @@
 bin/cantus_3
 lib/cantus_3/id3v1.so
 lib/cantus_3/vorbis.so
 lib/cantus_3/id3copier.so
 lib/cantus_3/tag2filename.so
 lib/cantus_3/mpegheader.so
 lib/cantus_3/id3v2.so
 lib/cantus_3/cantus-3.glade
 lib/cantus_3/general.png
 lib/cantus_3/cantus_tag.png
 share/gnome/help/cantus_3/C/figures/cantus_start_window.png
 share/gnome/help/cantus_3/C/legal.xml
 share/gnome/help/cantus_3/C/cantus_3.xml
 share/gnome/help/cantus_3/C/cantus_start_window.png
 share/locale/de/LC_MESSAGES/cantus_3.mo
 share/locale/es/LC_MESSAGES/cantus_3.mo
 share/locale/fr/LC_MESSAGES/cantus_3.mo
 share/locale/pl/LC_MESSAGES/cantus_3.mo
-@dirrm lib/cantus_3/
 @dirrm share/gnome/help/cantus_3/C/figures
 @dirrm share/gnome/help/cantus_3/C
 @dirrm share/gnome/help/cantus_3/
+@dirrm share/doc/cantus_3
+@dirrm lib/cantus_3/