diff -ruN /usr/ports/net-p2p/bitcoin/Makefile ./Makefile
--- /usr/ports/net-p2p/bitcoin/Makefile	2013-08-15 08:35:50.000000000 +1000
+++ ./Makefile	2013-09-13 23:34:59.000000000 +1000
@@ -1,8 +1,8 @@
 # Created by: Shaun Amott <shaun@FreeBSD.org>
-# $FreeBSD: net-p2p/bitcoin/Makefile 324744 2013-08-14 22:35:50Z ak $
+# $FreeBSD: net-p2p/bitcoin/Makefile 320373 2013-06-09 18:32:16Z rakuco $
 
 PORTNAME=	bitcoin
-PORTVERSION=	0.8.3
+PORTVERSION=	0.8.5
 CATEGORIES=	net-p2p finance
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.freebsd.org/~swills/ \
@@ -23,13 +23,14 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	bitcoin
 GH_PROJECT=	bitcoin
-GH_COMMIT=	6a0ba5c
+GH_COMMIT=	8090e11
 GH_TAGNAME=	v${PORTVERSION}
 
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 USE_BDB=	yes
 WANT_BDB_VER=	48
+MAKE_JOBS_SAFE=	yes
 
 CXXFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
 CXXFLAGS+=	-L${LOCALBASE}/lib -L${BDB_LIB_DIR}
diff -ruN /usr/ports/net-p2p/bitcoin/distinfo ./distinfo
--- /usr/ports/net-p2p/bitcoin/distinfo	2013-06-30 22:57:41.000000000 +1000
+++ ./distinfo	2013-09-13 16:33:45.000000000 +1000
@@ -1,2 +1,2 @@
-SHA256 (bitcoin-0.8.3.tar.gz) = c1082573e66cb711bbd989d4f0863354e4fe4dbc6d859b9d51f3eb06c749a052
-SIZE (bitcoin-0.8.3.tar.gz) = 3181606
+SHA256 (bitcoin-0.8.5.tar.gz) = 0a60bda22fb198a2682a6a0b3c82b3da053f76efdd5930eae9af3792bdc4bffe
+SIZE (bitcoin-0.8.5.tar.gz) = 3181937
diff -ruN /usr/ports/net-p2p/bitcoin/files/patch-leveldb_makefile ./files/patch-leveldb_makefile
--- /usr/ports/net-p2p/bitcoin/files/patch-leveldb_makefile	2013-04-24 12:42:20.000000000 +1000
+++ ./files/patch-leveldb_makefile	1970-01-01 10:00:00.000000000 +1000
@@ -1,58 +0,0 @@
-From 966781671d44a4bcaa4a03c8c59dc280acf2c595 Mon Sep 17 00:00:00 2001
-From: Sander Kleykens <sander@kleykens.com>
-Date: Sat, 23 Mar 2013 17:16:02 +0100
-Subject: [PATCH] Fix /dev/null getting removed during compilation on some
- systems.
-
----
- src/leveldb/build_detect_platform | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/leveldb/build_detect_platform b/src/leveldb/build_detect_platform
-index 609cb51..bebf607 100755
---- a/src/leveldb/build_detect_platform
-+++ src/leveldb/build_detect_platform
-@@ -25,6 +25,8 @@
- #       -DSNAPPY                     if the Snappy library is present
- #
- 
-+TMPDIR="/tmp"
-+
- OUTPUT=$1
- PREFIX=$2
- if test -z "$OUTPUT" || test -z "$PREFIX"; then
-@@ -164,7 +166,9 @@ if [ "$CROSS_COMPILE" = "true" ]; then
-     true
- else
-     # If -std=c++0x works, use <cstdatomic>.  Otherwise use port_posix.h.
--    $CXX $CXXFLAGS -std=c++0x -x c++ - -o /dev/null 2>/dev/null  <<EOF
-+    CPP0X_TEST_TEMPFILE="${TMPDIR}/leveldb-build_detect_platform_cpp0x.$$"
-+
-+    $CXX $CXXFLAGS -std=c++0x -x c++ - -o ${CPP0X_TEST_TEMPFILE} 2>/dev/null  <<EOF
-       #include <cstdatomic>
-       int main() {}
- EOF
-@@ -175,13 +179,19 @@ EOF
-         COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX"
-     fi
- 
-+    rm -f ${CPP0X_TEST_TEMPFILE} > /dev/null 2>&1
-+
-     # Test whether tcmalloc is available
--    $CXX $CXXFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null  <<EOF
-+    TCMALLOC_TEST_TEMPFILE="${TMPDIR}/leveldb-build_detect_platform_tcmalloc.$$"
-+
-+    $CXX $CXXFLAGS -x c++ - -o ${TCMALLOC_TEST_TEMPFILE} -ltcmalloc 2>/dev/null  <<EOF
-       int main() {}
- EOF
-     if [ "$?" = 0 ]; then
-         PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
-     fi
-+
-+    rm -f ${TCMALLOC_TEST_TEMPFILE} > /dev/null 2>&1
- fi
- 
- PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"
--- 
-1.8.1.5
-