diff --git a/net-p2p/rtorrent/patches/rtorrent_x86-0.9.6.patchset b/net-p2p/rtorrent/patches/rtorrent-0.9.7.patchset
similarity index 56%
rename from net-p2p/rtorrent/patches/rtorrent_x86-0.9.6.patchset
rename to net-p2p/rtorrent/patches/rtorrent-0.9.7.patchset
index c2536f229..9fe7d34aa 100644
--- a/net-p2p/rtorrent/patches/rtorrent_x86-0.9.6.patchset
+++ b/net-p2p/rtorrent/patches/rtorrent-0.9.7.patchset
@@ -1,32 +1,30 @@
-From 818adc5bba3ee6963f320bdfdfd19b268fe71044 Mon Sep 17 00:00:00 2001
+From a20d75b432680c844cdd831dcc426861f30ac91e Mon Sep 17 00:00:00 2001
 From: miqlas <zmizsei@extrowerk.com>
-Date: Sun, 31 Jul 2016 12:51:31 +0200
-Subject: [PATCH] Haiku Fix
+Date: Thu, 3 Jan 2019 14:53:01 +0300
+Subject: Fix build on Haiku
 
----
- src/core/poll_manager.cc |  4 ++++
- src/input/path_input.cc  | 12 +++++++++++-
- src/utils/directory.cc   |  9 +++++++++
- src/utils/directory.h    |  4 ++++
- 4 files changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/src/core/poll_manager.cc b/src/core/poll_manager.cc
-index 1a3a0a5..741dd7e 100644
+old mode 100755
+new mode 100644
+index 1a3a0a5..1818d78
 --- a/src/core/poll_manager.cc
 +++ b/src/core/poll_manager.cc
-@@ -48,6 +48,10 @@
- #include "manager.h"
- #include "poll_manager.h"
+@@ -36,6 +36,10 @@
+ 
+ #include "config.h"
  
 +#ifdef __HAIKU__
 +#include <sys/select.h>
 +#endif
 +
- namespace core {
- 
- torrent::Poll*
+ #include <stdexcept>
+ #include <unistd.h>
+ #include <torrent/exceptions.h>
 diff --git a/src/input/path_input.cc b/src/input/path_input.cc
-index fa8afda..55a09da 100644
+old mode 100755
+new mode 100644
+index caf1e17..607cfb7
 --- a/src/input/path_input.cc
 +++ b/src/input/path_input.cc
 @@ -48,6 +48,12 @@
@@ -42,21 +40,17 @@ index fa8afda..55a09da 100644
  namespace input {
  
  PathInput::PathInput() :
-@@ -75,7 +81,11 @@ PathInput::pressed(int key) {
+@@ -75,7 +81,7 @@ PathInput::pressed(int key) {
  
  struct _transform_filename {
    void operator () (utils::directory_entry& entry) {
--    if (entry.d_type == DT_DIR)
-+	#ifdef __HAIKU__
-+		if (S_ISDIR(entry.d_type))
-+	#else
-+		if (entry.d_type == DT_DIR)
-+	#endif
-       entry.d_name += '/';
-   }
- };
+-#ifdef __sun__
++#if defined (__sun__) || defined(__HAIKU__)
+     if (entry.d_type & S_IFDIR)
+ #else
+     if (entry.d_type == DT_DIR)
 diff --git a/src/utils/directory.cc b/src/utils/directory.cc
-index f934aeb..73d23f9 100644
+index f934aeb..73d23f9 100755
 --- a/src/utils/directory.cc
 +++ b/src/utils/directory.cc
 @@ -46,6 +46,10 @@
@@ -84,7 +78,7 @@ index f934aeb..73d23f9 100644
  
  #ifdef DIRENT_NAMLEN_EXISTS_FOOBAR
 diff --git a/src/utils/directory.h b/src/utils/directory.h
-index ec8027b..f11a418 100644
+index ec8027b..f11a418 100755
 --- a/src/utils/directory.h
 +++ b/src/utils/directory.h
 @@ -41,6 +41,10 @@
@@ -98,6 +92,26 @@ index ec8027b..f11a418 100644
  namespace utils {
  
  struct directory_entry {
+diff --git a/src/utils/socket_fd.cc b/src/utils/socket_fd.cc
+old mode 100755
+new mode 100644
+index e30594d..6cb58ee
+--- a/src/utils/socket_fd.cc
++++ b/src/utils/socket_fd.cc
+@@ -71,9 +71,11 @@ SocketFd::set_priority(priority_type p) {
+   check_valid();
+   int opt = p;
+ 
++#ifndef __HAIKU__
+   if (m_ipv6_socket)
+-    return setsockopt(m_fd, IPPROTO_IPV6, IPV6_TCLASS, &opt, sizeof(opt)) == 0;
+-  else
++     return setsockopt(m_fd, IPPROTO_IPV6, IPV6_TCLASS, &opt, sizeof(opt)) == 0;
++   else
++#endif
+     return setsockopt(m_fd, IPPROTO_IP, IP_TOS, &opt, sizeof(opt)) == 0;
+ }
+ 
 -- 
-2.7.0
+2.19.1
 
diff --git a/net-p2p/rtorrent/rtorrent-0.9.6.recipe b/net-p2p/rtorrent/rtorrent-0.9.7.recipe
similarity index 80%
rename from net-p2p/rtorrent/rtorrent-0.9.6.recipe
rename to net-p2p/rtorrent/rtorrent-0.9.7.recipe
index 1758c993d..edfbb79fc 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.6.recipe
+++ b/net-p2p/rtorrent/rtorrent-0.9.7.recipe
@@ -3,14 +3,14 @@ DESCRIPTION="rTorrent is a text-based ncurses BitTorrent client written in C++,
 based on the libTorrent libraries for Unix, whose author's goal is 'a \
 focus on high performance and good code'."
 HOMEPAGE="http://libtorrent.rakshasa.no/"
-COPYRIGHT="2005-2016 Jari Sundell"
+COPYRIGHT="2005-2018 Jari Sundell"
 LICENSE="GNU LGPL v2"
 REVISION="1"
-SOURCE_URI="https://github.com/rakshasa/rtorrent/archive/$portVersion.zip"
-CHECKSUM_SHA256="228cd2fac94860dcee42a03f4bdc6a4deeec9b33ed7de356b64fc5e175481ee8"
-PATCHES="rtorrent_x86-$portVersion.patchset"
+SOURCE_URI="https://github.com/rakshasa/rtorrent/releases/download/v$portVersion/rtorrent-$portVersion.tar.gz"
+CHECKSUM_SHA256="5d9842fe48c9582fbea2c7bf9f51412c1ccbba07d059b257039ad53b863fe8bb"
+PATCHES="rtorrent-$portVersion.patchset"
 
-ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+ARCHITECTURES="x86 ?x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -19,6 +19,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libcppunit$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
 	lib:libgettextpo$secondaryArchSuffix
@@ -54,6 +55,7 @@ BUILD()
 {
 	autoreconf -vfi
 	export CFLAGS=-D_BSD_SOURCE
+	export LDFLAGS=-lnetwork
 	runConfigure ./configure
 	make $jobArgs
 }
@@ -61,7 +63,6 @@ BUILD()
 INSTALL()
 {
 	make install
-
 	strip $binDir/*
 }