diff --git a/sysutils/bubblemon/Makefile b/sysutils/bubblemon/Makefile
index 41f1fa71707..b66a6af10fc 100644
--- a/sysutils/bubblemon/Makefile
+++ b/sysutils/bubblemon/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.33 2009/08/10 06:34:29 kili Exp $
+# $OpenBSD: Makefile,v 1.34 2009/10/15 10:46:18 jasper Exp $
 
 COMMENT=		GNOME panel applet that displays CPU and memory load
 
 DISTNAME=		bubblemon-2.0.12
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 CATEGORIES=		sysutils x11/gnome
 
 HOMEPAGE=		http://www.nongnu.org/bubblemon/
@@ -16,20 +16,19 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage \
-		Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender \
-		art_lgpl_2 atk-1.0 bonobo-2 dbus-1 gio-2.0 \
-		bonobo-activation bonoboui-2 c cairo expat \
-		fontconfig freetype gailutil gconf-2 gdk-x11-2.0 \
-		gdk_pixbuf-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 \
-		gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2 \
-		gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0 \
-		pangocairo-1.0 pangoft2-1.0 pixman-1 png popt \
-		pthread pthread-stubs xcb xml2 z
-
 MODULES=		devel/gettext \
 			textproc/intltool
 
+WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0
+WANTLIB += bonobo-2 bonobo-activation bonoboui-2 c cairo dbus-1
+WANTLIB += expat fontconfig freetype gailutil gconf-2 gdk-x11-2.0
+WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 gnome-2
+WANTLIB += gnomecanvas-2 gnome-keyring gnomeui-2 gnomevfs-2 gobject-2.0
+WANTLIB += gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pixman-1 png popt pthread pthread-stubs
+WANTLIB += xcb xml2 z
+
 LIB_DEPENDS=		panel-applet-2::x11/gnome/panel \
 			gtop-2.0.>=3.0::devel/libgtop2
 
@@ -37,8 +36,10 @@ USE_X11=		Yes
 USE_GMAKE=		Yes
 
 CONFIGURE_STYLE= 	gnu
-CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include \
+			`pkg-config --cflags libgnomeui-2.0`"
+CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib \
+			`pkg-config --libs libgnomeui-2.0`"
 
 FAKE_FLAGS=		itlocaledir=${PREFIX}/share/locale