diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
index 822c7898e308..934907dfcbe7 100644
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	bitcoin
 PORTVERSION=	0.15.0.1
 DISTVERSIONPREFIX=	v
+PORTREVISION?=	1
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	robbak@robbak.com
diff --git a/net-p2p/bitcoin/files/bitcoind.in b/net-p2p/bitcoin/files/bitcoind.in
index e620d9dcc4fb..4df6ec8f6bc1 100644
--- a/net-p2p/bitcoin/files/bitcoind.in
+++ b/net-p2p/bitcoin/files/bitcoind.in
@@ -12,7 +12,7 @@
 # bitcoind_user (str)		Set to "bitcoin" by default.
 # bitcoind_group (str)		Set to "bitcoin" by default.
 # bitcoind_conf (str)		Set to "%%PREFIX%%/etc/bitcoind.conf" by default.
-# bitcoind_data (str)		Set to "/var/lib/bitcoin" by default.
+# bitcoind_data_dir (str)	Set to "/var/db/bitcoin" by default.
 # bitcoindlimits_enable (bool)	Set to "NO" by default.
 #				Set it to "YES" to enable bitcoindlimits
 # bitcoindlimits_args		Set to "-e -U ${bitcoind_user}" by default
@@ -121,7 +121,9 @@ bitcoind_start()
   ${daemon_command} -u "${bitcoind_user}" -p "${pidfile}" \
     ${command} \
     -conf="${bitcoind_config_file}" \
-    -datadir="${bitcoind_data_dir}" 2> /tmp/bitcoind.stderr > /tmp/bitcoind.stdout
+    -datadir="${bitcoind_data_dir}" \
+    2> "${bitcoind_data_dir}/bitcoind.stderr" \
+    > "${bitcoind_data_dir}/bitcoind.stdout"
 }
 
 bitcoind_stop()