diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 446da3f48eea..12e7f8db07e5 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,30 +7,46 @@
 
 PORTNAME=	ekiga
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
 
 MAINTAINER=	jbq@caraldi.com
-COMMENT=	VoIP phone for Gnome
+COMMENT=	VoIP phone for GNOME
 
-LIB_DEPENDS=	opal__r.2:${PORTSDIR}/net/opal \
-		avahi-core.4:${PORTSDIR}/net/avahi \
-		ebook-1.2.5:${PORTSDIR}/databases/evolution-data-server
+LIB_DEPENDS=	opal_r.2:${PORTSDIR}/net/opal
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl
-USE_GNOME=	libgnomeui libbonobo gnomeprefix gnomehack gnomelibs gnomedocutils
+INSTALLS_OMF=	yes
+USE_GNOME=	libgnomeui gnomeprefix gnomehack gnomedocutils \
+		evolutiondataserver
 USE_AUTOTOOLS=	libtool:15
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ENV=	SDL_CONFIG=${LOCALBASE}/bin/sdl11-config LDFLAGS="${LDFLAGS}"
-
 CONFIGURE_ARGS=	--with-pwlib-dir=${LOCALBASE} \
 		--with-opal-dir=${LOCALBASE}
 
 GCONF_SCHEMAS=	ekiga.schemas
 MAN1=		ekiga.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.ifndef (WITHOUT_AVAHI)
+LIB_DEPENDS+=	avahi-core.4:${PORTSDIR}/net/avahi
+CONFIGURE_ARGS+=--enable-avahi
+.else
+CONFIGURE_ARGS+=--disable-avahi
+.endif
+
+.ifndef (WITHOUT_DBUS)
+LIB_DEPENDS+=	dbus-1.2:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+=--enable-dbus
+.else
+CONFIGURE_ARGS+=--disable-dbus
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/ekiga/pkg-descr b/net/ekiga/pkg-descr
index 6eea360e530f..6413ccfc2d24 100644
--- a/net/ekiga/pkg-descr
+++ b/net/ekiga/pkg-descr
@@ -2,6 +2,6 @@ Ekiga is a free Voice over IP phone allowing you to do free calls over the
 Internet.
 
 Ekiga is the first Open Source application to support both H.323 and SIP, as
-well as audio and video. Ekiga was formerly known as GnomeMeeting. 
+well as audio and video. Ekiga was formerly known as GnomeMeeting.
 
 WWW: http://www.ekiga.org/