diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 006c635efcad..2285e219e0e7 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -1,47 +1,46 @@
 PORTNAME=	gnubiff
 PORTVERSION=	2.2.13
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Mail notification program for Gnome
 WWW=		https://gnubiff.sourceforge.net/
 
 LIB_DEPENDS=	libpopt.so:devel/popt
 
 OPTIONS_DEFINE=	NLS
 
-USES=		compiler:c++11-lang cpe fam gmake gnome pathfix pkgconfig
+USES=		compiler:c++11-lang cpe fam gmake gnome pkgconfig
 USE_GNOME=	intlhack libglade2
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lX11
 
 # CXXFLAGS needed to work round issue with gcc and openssl 0.9.8a
 # /usr/local/include/openssl/sha.h:173: error: ISO C++ does not support `long long'
 CXXFLAGS+=	"-Wno-long-long"
 
 INFO=		gnubiff
 CPE_VENDOR=	gnu
 
 .include <bsd.port.options.mk>
 
 .ifdef(WITH_GNUBIFF_PASSWORD)
 CONFIGURE_ARGS+=	--with-password
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=		NLS=""
 USES+=		gettext
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .endif
 
 CONFIGURE_ARGS+=	--disable-gnome
-PLIST_SUB+=		BONOBODIR="libdata/bonobo"
 
 .include <bsd.port.mk>
diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist
index 9d9c702a3512..64b14e30b243 100644
--- a/mail/gnubiff/pkg-plist
+++ b/mail/gnubiff/pkg-plist
@@ -1,37 +1,37 @@
 bin/gnubiff
 share/applications/gnubiff.desktop
 %%NLS%%share/locale/cs/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/de/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/es/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/fr_CA/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/fr_FR/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/id/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/it/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/rw/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gnubiff.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/gnubiff.mo
 share/gnubiff/applet-gtk.glade
 share/gnubiff/authentication.glade
 share/gnubiff/certificate.glade
 share/gnubiff/coin.wav
 share/gnubiff/envelopes.png
 share/gnubiff/gnubiff.png
 share/gnubiff/mail.wav
 share/gnubiff/popup.glade
 share/gnubiff/preferences.glade
 share/gnubiff/properties.glade
 share/gnubiff/tux-awake.png
 share/gnubiff/tux-big.png
 share/gnubiff/tux-jump(64x64).png
 share/gnubiff/tux-sleep(64x64).png
 share/gnubiff/tux-sleep.png
 share/man/man1/gnubiff.1.gz
 share/pixmaps/gnubiff.png
-@dir %%BONOBODIR%%/servers
+@comment @dir lib/bonobo/servers
 @comment @dir share/gnome-2.0/ui