diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile
index e06db889c5a..b979f1045e4 100644
--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2009/01/16 02:46:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2009/02/02 23:27:48 ajacoutot Exp $
 
 COMMENT=	VNC server for real X displays
 
 DISTNAME=	x11vnc-0.9.6
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=     x11
 
 HOMEPAGE=	http://www.karlrunge.com/x11vnc/
@@ -19,13 +20,17 @@ WANTLIB=	X11 Xext Xinerama Xtst c pthread z
 WANTLIB+=	Xdamage Xfixes Xrandr crypto ssl
 
 RUN_DEPENDS=	::devel/desktop-file-utils
+LIB_DEPENDS=	jpeg::graphics/jpeg
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libvncserver/}
 
 USE_X11=	Yes
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=--with-x
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=--with-x \
+		--without-avahi
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/x11vnc
diff --git a/x11/x11vnc/pkg/PLIST b/x11/x11vnc/pkg/PLIST
index 745a2f190b4..32c9ac77f35 100644
--- a/x11/x11vnc/pkg/PLIST
+++ b/x11/x11vnc/pkg/PLIST
@@ -1,7 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.3 2009/01/16 02:46:22 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.4 2009/02/02 23:27:48 ajacoutot Exp $
 @bin bin/x11vnc
 @man man/man1/x11vnc.1
-share/applications/
 share/applications/x11vnc.desktop
 share/doc/x11vnc/
 share/doc/x11vnc/README