diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 710e1476c3cb..0a62a764a65d 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome-panel
 PORTVERSION=	2.32.1
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,30 +12,30 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Panel component for the GNOME 2 Desktop
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	gweather:${PORTSDIR}/net/libgweather \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		canberra-gtk:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS=	libgweather.so:${PORTSDIR}/net/libgweather \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
 
 CONFLICTS=	gnome-panel-3.[0-9]*
 
 USE_XORG=	ice sm x11 xau xrandr
 USE_PYTHON=	2
 INSTALLS_OMF=	yes
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USES=		pathfix gettext gmake pkgconfig
+USES+=		pathfix libtool gettext gmake pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomedesktop libwnck gnomemenus \
-		gnomedocutils ltverhack referencehack librsvg2
-USE_AUTOTOOLS=	libtool
+		gnomedocutils referencehack librsvg2
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-network-manager
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-MAN1=		gnome-panel.1
 GCONF_SCHEMAS=	clock.schemas fish.schemas \
 		panel-compatibility.schemas panel-general.schemas \
 		panel-global.schemas panel-object.schemas \
@@ -47,7 +47,6 @@ OPTIONS_DEFAULT=EVOLUTION BONOBO
 EVOLUTION_DESC=	Use the Evolution calendar
 BONOBO_DESC=	Support for bonobo applets aka Gnome 2 applets
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEVOLUTION}
@@ -76,10 +75,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|python.* python2\.0|${PYTHON_VERSION}|g' \
 		${WRKSRC}/configure
 
-post-install:
-	@${MKDIR} ${PREFIX}/lib/gnome-panel/modules
-	-${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gnome-panel/modules
-
 .include <bsd.port.mk>
 
 .endif
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 54e275147950..fc3ca2757e25 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -25,10 +25,12 @@ lib/girepository-1.0/PanelApplet-3.0.typelib
 %%BONOBO%%lib/libpanel-applet-2.la
 %%BONOBO%%lib/libpanel-applet-2.so
 %%BONOBO%%lib/libpanel-applet-2.so.0
+%%BONOBO%%lib/libpanel-applet-2.so.0.2.73
 lib/libpanel-applet-3.a
 lib/libpanel-applet-3.la
 lib/libpanel-applet-3.so
 lib/libpanel-applet-3.so.0
+lib/libpanel-applet-3.so.0.0.6
 %%BONOBO%%libdata/pkgconfig/libpanelapplet-2.0.pc
 libdata/pkgconfig/libpanelapplet-3.0.pc
 libexec/clock-applet
@@ -36,6 +38,7 @@ libexec/fish-applet
 libexec/gnome-panel-add
 libexec/notification-area-applet
 libexec/wnck-applet
+man/man1/gnome-panel.1.gz
 share/applications/gnome-panel.desktop
 share/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
 share/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service