diff --git a/net-p2p/rtorrent-devel/Makefile b/net-p2p/rtorrent-devel/Makefile
index cc42c6aba7e7..7b6e02381782 100644
--- a/net-p2p/rtorrent-devel/Makefile
+++ b/net-p2p/rtorrent-devel/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	rtorrent-devel
-PORTVERSION=	0.8.3
+PORTVERSION=	0.8.4
 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.3:${PORTSDIR}/net-p2p/libtorrent-devel
-RUN_DEPENDS=	libtorrent-devel=0.12.3:${PORTSDIR}/net-p2p/libtorrent-devel
+BUILD_DEPENDS=	libtorrent-devel=0.12.4:${PORTSDIR}/net-p2p/libtorrent-devel
+RUN_DEPENDS=	libtorrent-devel=0.12.4:${PORTSDIR}/net-p2p/libtorrent-devel
 
 MASTERDIR=	${.CURDIR}/../rtorrent
+PATCHDIR=	${.CURDIR}/files/
 MD5_FILE=	${.CURDIR}/distinfo
 PLIST=		${.CURDIR}/pkg-plist
 DESCR=		${MASTERDIR}/pkg-descr
@@ -25,8 +26,4 @@ CONFLICTS=	rtorrent-[0-9]*
 
 USE_GCC=	4.2+
 
-.if exists(${.CURDIR}/files/devel-*)
-EXTRA_PATCHES=	${.CURDIR}/files/devel-*
-.endif
-
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/rtorrent-devel/distinfo b/net-p2p/rtorrent-devel/distinfo
index 985293a99571..532988786590 100644
--- a/net-p2p/rtorrent-devel/distinfo
+++ b/net-p2p/rtorrent-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (rtorrent-0.8.3.tar.gz) = d1b43acf08e371a56915293bbcf584c6
-SHA256 (rtorrent-0.8.3.tar.gz) = 554456550ca6e792297d6d39367120af5b2bd6181d514a43faf4e2f565721908
-SIZE (rtorrent-0.8.3.tar.gz) = 512961
+MD5 (rtorrent-0.8.4.tar.gz) = dc0f37d933b0b6c713ad617e09441f3b
+SHA256 (rtorrent-0.8.4.tar.gz) = 257722380b39e84e700e9f2d2f6600ba724723f1ed59327bfce47a57d293eeee
+SIZE (rtorrent-0.8.4.tar.gz) = 518306
diff --git a/net-p2p/rtorrent-devel/files/devel-src_command__network.cc b/net-p2p/rtorrent-devel/files/patch-src_command__network.cc
similarity index 100%
rename from net-p2p/rtorrent-devel/files/devel-src_command__network.cc
rename to net-p2p/rtorrent-devel/files/patch-src_command__network.cc