diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile
index 2cd3d991d1ca..1fa30b926d86 100644
--- a/net/x11vnc/Makefile
+++ b/net/x11vnc/Makefile
@@ -1,52 +1,64 @@
 # New ports collection makefile for:	x11vnc
 # Date created:				7 June 2005
 # Whom:					Loren M. Lang
 #
 # $FreeBSD$
 #
 
 PORTNAME=	x11vnc
 PORTVERSION=	0.9.13
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/libvncserver/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	VNC server for use with real X displays
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		dbus:${PORTSDIR}/devel/dbus \
 		xcb:${PORTSDIR}/x11/libxcb \
-		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		avahi-common:${PORTSDIR}/net/avahi-app
-
-LICENSE=	GPLv2
+		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
 
 USE_XORG=	x11 xdamage xfixes xrandr xinerama xext xtst xau xrender xdmcp recordproto
 
 # Sets LDFLAGS and adds to CONFIGURE_ENV, therefore we set LDFLAGS
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_OPENSSL=	yes
 USE_ICONV=	yes
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-.endif
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		x11vnc.1
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README README.LibVNCServer TODO
 
+OPTIONS=	NLS "Build with gettext support" on \
+		AVAHI "Enable AVAHI (ZeroConf)" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+.endif
+
+.if !defined(WITHOUT_AVAHI)
+LIB_DEPENDS+=	avahi-common:${PORTSDIR}/net/avahi-app
+.else
+CONFIGURE_ARGS+=	--without-avahi
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|include_HEADERS = |noinst_HEADERS = |' \
 		-e 's|am__include_HEADERS_DIST|am__noinst_HEADERS_DIST|' \
 		-e 's|/include/rfb|/include|' ${WRKSRC}/Makefile.in
 
 .if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>