diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 48d31c8479d3..04d7869e66df 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-media
 PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia xfce
 MASTER_SITES=	http://spuriousinterrupt.org/files/xfmedia/
 DISTNAME=	xfmedia-${PORTVERSION}
@@ -20,14 +20,14 @@ LIB_DEPENDS=	xine.16:${PORTSDIR}/multimedia/libxine \
 		exo-0.3:${PORTSDIR}/x11/libexo
 
 GNU_CONFIGURE=	yes
-INSTALLS_ICONS= yes
+INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GCC=	3.4+
 USE_GETOPT_LONG=yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE=	configenv libexo libgui libutilpanel
+USE_XFCE=	configenv libexo libgui libutil panel
 USE_XLIB=	yes
 
 OPTIONS=	TAGLIB	"Enable metadata editing"		off \
@@ -58,6 +58,8 @@ CONFIGURE_ARGS+=--enable-startup-notification
 CONFIGURE_ARGS+=--disable-startup-notification
 .endif
 
+CFLAGS+=	-I${LOCALBASE}/include
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|xfmedia_remote_LDADD = |&@LIBXFCEGUI4_LIBS@|" \
 		${WRKSRC}/src/Makefile.in
diff --git a/multimedia/xfce4-media/files/patch-gmsgfmt b/multimedia/xfce4-media/files/patch-gmsgfmt
new file mode 100644
index 000000000000..842866568ab4
--- /dev/null
+++ b/multimedia/xfce4-media/files/patch-gmsgfmt
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	Thu Feb  8 14:27:07 2007
++++ po/Makefile.in.in	Thu Feb  8 14:27:52 2007
+@@ -44,7 +44,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+
+-GMSGFMT = @GMSGFMT@
++GMSGFMT = @INTLTOOL_MSGFMT@
+ MSGFMT = @MSGFMT@
+ XGETTEXT_ARGS = @XGETTEXT_ARGS@
+ XGETTEXT = @XGETTEXT@ $(XGETTEXT_ARGS)