diff --git a/net-p2p/rtorrent-devel/Makefile b/net-p2p/rtorrent-devel/Makefile
index b340d86878ab..4cd12553bf40 100644
--- a/net-p2p/rtorrent-devel/Makefile
+++ b/net-p2p/rtorrent-devel/Makefile
@@ -1,29 +1,28 @@
 # New ports collection makefile for:	rtorrent-devel
 # Date created:				May 17 2006
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	rtorrent-devel
 PORTVERSION=	0.8.2
 PORTREVISION=	0
 DISTNAME=	${PORTNAME:S/-devel//}-${PORTVERSION}
 
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	BitTorrent Client written in C++ (development version)
 
 BUILD_DEPENDS=	libtorrent-devel=0.12.2:${PORTSDIR}/net-p2p/libtorrent-devel
 RUN_DEPENDS=	libtorrent-devel=0.12.2:${PORTSDIR}/net-p2p/libtorrent-devel
-LIB_DEPENDS=	# empty
 
 MASTERDIR=	${.CURDIR}/../rtorrent
 MD5_FILE=	${.CURDIR}/distinfo
 PLIST=		${.CURDIR}/pkg-plist
 DESCR=		${MASTERDIR}/pkg-descr
 
 CONFLICTS=	rtorrent-[0-9]*
 
 USE_GCC=	4.2+
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile
index 5ba2c589b6a5..850a1bfde64c 100644
--- a/net-p2p/rtorrent/Makefile
+++ b/net-p2p/rtorrent/Makefile
@@ -1,59 +1,57 @@
 # New ports collection makefile for:	rtorrent
 # Date created:				Mar 03 2005
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	rtorrent
 PORTVERSION?=	0.7.9
 PORTREVISION?=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	flz/rtorrent/
 
 MAINTAINER?=	flz@FreeBSD.org
 COMMENT?=	BitTorrent Client written in C++
 
-LIB_DEPENDS?=	# empty
-
 BUILD_DEPENDS?=	libtorrent=0.11.9:${PORTSDIR}/net-p2p/libtorrent
 RUN_DEPENDS?=	libtorrent=0.11.9:${PORTSDIR}/net-p2p/libtorrent
-LIB_DEPENDS+=	curl.4:${PORTSDIR}/ftp/curl
+LIB_DEPENDS?=	curl.4:${PORTSDIR}/ftp/curl
 
 CONFLICTS?=	rtorrent-devel-[0-9]*
 
 MAN1=		rtorrent.1
 
-USE_GCC=	3.4+
+USE_GCC?=	3.4+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 SUB_FILES=	pkg-message
 
 PORTDOCS=	README
 
 OPTIONS=	XMLRPC "Compile with xmlrpc-c support" on
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_XMLRPC)
 CONFIGURE_ARGS+=	--with-xmlrpc-c
 LIB_DEPENDS+=	xmlrpc.9:${PORTSDIR}/net/xmlrpc-c
 .else
 CONFIGURE_ARGS+=	--with-xmlrpc-c=no
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure
 
 post-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}/
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc ${EXAMPLESDIR}/
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>