diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
index f8830747f2ac..d9fa52f3f005 100644
--- a/irc/bitlbee/Makefile
+++ b/irc/bitlbee/Makefile
@@ -1,116 +1,112 @@
 PORTNAME=	bitlbee
 PORTVERSION=	3.6
 PORTREVISION=	2
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
 		LOCAL/brix
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	IRC to other chat networks gateway
 WWW=		https://www.bitlbee.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xmlto:textproc/xmlto \
 		xsltproc:textproc/libxslt
 
 USES=		cpe gettext-runtime gmake gnome pkgconfig
 
 USE_GNOME=	glib20
 USE_RC_SUBR=	bitlbee
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=		--config=/var/db/bitlbee \
 			--pcdir=${PREFIX}/libdata/pkgconfig \
 			--prefix=${PREFIX} \
 			--mandir=${PREFIX}/share/man \
 			--strip=1 \
 			--yahoo=0
 
 SUB_FILES=	pkg-message
 
 USERS=		bitlbee
 GROUPS=		bitlbee
 
 PORTDOCS=	AUTHORS CHANGES CREDITS FAQ README
 PORTEXAMPLES=	bitlbee.conf motd.txt
 
 OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES LDAP OTR PAM
-OPTIONS_DEFAULT=	GLIB GNUTLS JABBER OSCAR OTR TWITTER
+OPTIONS_DEFAULT=	GLIB GNUTLS JABBER OTR TWITTER
 
 OPTIONS_MULTI=		PROTO
-OPTIONS_MULTI_PROTO=	LIBPURPLE JABBER MSN OSCAR TWITTER
+OPTIONS_MULTI_PROTO=	LIBPURPLE JABBER TWITTER
 
 OPTIONS_SINGLE=		EVENTS SSL
 OPTIONS_SINGLE_EVENTS=	GLIB LIBEVENT
 OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS NSS
 
 OPTIONS_SUB=	yes
 
 GLIB_DESC=		Use glib as event handler
 LIBEVENT_DESC=		Use libevent as event handler
 LIBPURPLE_DESC=		Use libpurple for protocol support
-MSN_DESC=		Microsoft Messenger support
-OSCAR_DESC=		OSCAR (ICQ) support
 OTR_DESC=		Off-the-Record Messaging support
 TWITTER_DESC=		Twitter support
 
 DEBUG_CONFIGURE_ON=	--debug=1
 DOCS_USES=		python:build
 DOCS_CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 GLIB_CONFIGURE_ON=	--events=glib
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error
 GNUTLS_CONFIGURE_ON=	--ssl=gnutls
 JABBER_CONFIGURE_OFF=	--jabber=0
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--ldap=1
 LIBEVENT_BROKEN=	bitlbee w/ libevent fails to start as daemon or fork
 LIBEVENT_LIB_DEPENDS=	libevent.so:devel/libevent
 LIBEVENT_CONFIGURE_ON=	--events=libevent --libevent=${LOCALBASE}
-LIBPURPLE_PREVENTS=	JABBER MSN OSCAR TWITTER
+LIBPURPLE_PREVENTS=	JABBER TWITTER
 LIBPURPLE_PREVENTS_MSG=	If libpurple is enabled, all native protocols must be disabled
 LIBPURPLE_LIB_DEPENDS=	libpurple.so:net-im/libpurple
 LIBPURPLE_CONFIGURE_ON=	--purple=1
-MSN_CONFIGURE_OFF=	--msn=0
 NSS_LIB_DEPENDS=	libnss3.so:security/nss \
 			libnspr4.so:devel/nspr \
 			libplc4.so:devel/nspr \
 			libplds4.so:devel/nspr
 NSS_CONFIGURE_ON=	--ssl=nss
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ON=	--ssl=openssl
-OSCAR_CONFIGURE_OFF=	--oscar=0
 OTR_LIB_DEPENDS=	libotr.so.5:security/libotr \
 			libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error
 OTR_CONFIGURE_ON=	--otr=1
 PAM_CONFIGURE_ON=	--pam=1
 TWITTER_CONFIGURE_OFF=	--twitter=0
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^install:/ s/$$/ install-dev/' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e "s|^\(EFLAGS=.*\)|\1 ${LDFLAGS}|" \
 			  -e "/include.*ldap.h/ s,-E,-I${LOCALBASE}/include -E," \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s:/etc/bitlbee/motd.txt:${ETCDIR}/motd.txt:" \
 		-e "s:/var/lib/bitlbee:/var/db/bitlbee:" \
 		${WRKSRC}/bitlbee.conf
 	@${REINPLACE_CMD} -e "s:/var/lib/bitlbee:/var/db/bitlbee:" \
 		${WRKSRC}/doc/bitlbee.8
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/doc/@} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/@} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>