diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index ea918e1ad..c33180dce 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -12,14 +12,14 @@
 #  - disable WiredTiger storage engine (FTBFS)
 
 pkgname=mongodb
-pkgver=3.0.4
+pkgver=3.0.5
 pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64')
 url='http://www.mongodb.org'
 license=('AGPL3')
 depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'v8-3.16' 'libsasl')
-makedepends=('scons' 'boost' 'readline' 'ncurses' 'libpcap')
+makedepends=('scons' 'readline' 'ncurses' 'libpcap' 'boost')
 checkdepends=('python2-pymongo')
 optdepends=('libpcap: needed for mongosniff'
             'mongodb-tools: mongoimport, mongodump, mongotop, etc')
@@ -28,7 +28,7 @@ install=mongodb.install
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
         'mongodb.conf' 'mongodb.service'
         '0006-Fix-ARM-alignment-problems.patch')
-sha512sums=('bd35a252cd351a2d755edf5e20c69c904de326d7e47aebc055cd0160476ecf966cf53f3263410c32f70e108ff2a019f86a21e1a71917246c2f13db9251082bc3'
+sha512sums=('17c66f9501e6517feba069f85bb468a421c45300306977ebfed71e6ce120e2bed64f14698e470c644360e23f40132171d64ac85f0962aa3ba824a48cf228775a'
             '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c'
             '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9'
             'b232277d906bc59aec5028485e251226e159a314c45cd2116186fc7a60264182cd591de08be0d69226ad4408d0e9af1648960c3ad1288bcb6b8df7d476136af4')
@@ -42,14 +42,13 @@ _scons_args=(
   --use-system-boost
   --variant-dir=build
   --ssl
+  --c++11=on
   --disable-warnings-as-errors
   --use-system-v8
   --wiredtiger=off
-  LIBS=atomic
 )
 # --use-system-yaml (Doesn't compile)
 # --use-system-tcmalloc (Disabled as upstream suggests in https://jira.mongodb.org/browse/SERVER-17447?focusedCommentId=841890&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-841890)
-# LIBS=atomic is a workaround for https://jira.mongodb.org/browse/SERVER-17447
 
 prepare() {
   cd mongodb-src-r${pkgver}