diff --git a/network/retroshare/README b/network/retroshare/README
index f27a5292fe..051d64fea0 100644
--- a/network/retroshare/README
+++ b/network/retroshare/README
@@ -6,3 +6,7 @@ and share files with your friends, family and coworkers, using a
 web-of-trust to authenticate peers and OpenSSL to encrypt all
 communication. RetroShare provides filesharing, chat, messages,
 forums and channels.
+
+To build the "Tor Only" version, use the build option "RETROTOR=yes", e.g.
+
+  RETROTOR=yes ./retroshare.SlackBuild
diff --git a/network/retroshare/retroshare.SlackBuild b/network/retroshare/retroshare.SlackBuild
index 672e8622ba..1861c03e25 100644
--- a/network/retroshare/retroshare.SlackBuild
+++ b/network/retroshare/retroshare.SlackBuild
@@ -18,7 +18,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=retroshare
-VERSION=${VERSION:-0.6.3}
+VERSION=${VERSION:-0.6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-qmake PREFIX=/usr LIB_DIR=/usr/lib${LIBDIRSUFFIX} "CONFIG-=debug" "CONFIG+=release"
+RETROTOR=${RETROTOR:-no}
+if [ $RETROTOR = yes ]; then
+  qmake-qt5 PREFIX=/usr LIB_DIR=/usr/lib${LIBDIRSUFFIX} "CONFIG-=debug" "CONFIG+=release" "CONFIG+=retrotor"
+else
+  qmake-qt5 PREFIX=/usr LIB_DIR=/usr/lib${LIBDIRSUFFIX} "CONFIG-=debug" "CONFIG+=release"
+fi
 make
 make INSTALL_ROOT=${PKG} install
 
diff --git a/network/retroshare/retroshare.info b/network/retroshare/retroshare.info
index ed8e937fa5..307a748169 100644
--- a/network/retroshare/retroshare.info
+++ b/network/retroshare/retroshare.info
@@ -1,10 +1,10 @@
 PRGNAM="retroshare"
-VERSION="0.6.3"
+VERSION="0.6.4"
 HOMEPAGE="http://retroshare.net"
-DOWNLOAD="https://github.com/RetroShare/RetroShare/archive/v0.6.3/RetroShare-0.6.3.tar.gz"
-MD5SUM="9cb22e4cc5a11e043601795eb9a175cc"
+DOWNLOAD="https://github.com/RetroShare/RetroShare/archive/v0.6.4/RetroShare-0.6.4.tar.gz"
+MD5SUM="392c36bb3171fa26b8702e0a984d5bd6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libmicrohttpd libupnp speex protobuf sqlcipher"
+REQUIRES="qt5 libmicrohttpd libupnp-legacy speex protobuf sqlcipher"
 MAINTAINER="Alan Aversa"
 EMAIL="aveNOrsa@email.ariSPAMzona.edu"