diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile
index 10a0d4faf63e..731b8dcdbb84 100644
--- a/net/crescendo/Makefile
+++ b/net/crescendo/Makefile
@@ -15,8 +15,8 @@ RUN_DEPENDS=	tf:${PORTSDIR}/net/tinyfugue
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-USE_GNOMELIBS=	yes
 CONFIGURE_ARGS+=	--enable-compile-warnings=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -25,6 +25,11 @@ PLIST_SUB=	DOCDIR=${DOCDIR}
 
 DOCDIR=		share/doc/${PORTNAME}
 
+pre-patch:
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(prefix\)/share/|\$\(datadir\)/|g'
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/${DOCDIR}
diff --git a/net/crescendo/pkg-plist b/net/crescendo/pkg-plist
index 653640ec4da0..4eed6f4795c0 100644
--- a/net/crescendo/pkg-plist
+++ b/net/crescendo/pkg-plist
@@ -1,9 +1,9 @@
 bin/crescendo
-share/crescendo/cr-about.jpg
-share/crescendo/cr-splash1.jpg
-share/crescendo/startup2.wav
-share/gnome/gnome/apps/Internet/crescendo.desktop
-share/pixmaps/crescendo.png
+share/gnome/crescendo/cr-about.jpg
+share/gnome/crescendo/cr-splash1.jpg
+share/gnome/crescendo/startup2.wav
+share/gnome/apps/Internet/crescendo.desktop
+share/gnome/pixmaps/crescendo.png
 %%DOCDIR%%/AUTHORS
 %%DOCDIR%%/COPYING
 %%DOCDIR%%/ChangeLog
@@ -14,4 +14,4 @@ share/pixmaps/crescendo.png
 %%DOCDIR%%/README.BINARY
 %%DOCDIR%%/TODO
 @dirrm %%DOCDIR%%
-@dirrm share/crescendo
+@dirrm share/gnome/crescendo