diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD
index b2294df30..5f8e4dcf8 100644
--- a/extra/intel-tbb/PKGBUILD
+++ b/extra/intel-tbb/PKGBUILD
@@ -3,15 +3,16 @@
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Denis Martinez <deuns.martinez AT gmail.com>
 
-# ALARM: Romain Reignier <rom.reignier AT gmail.com>
-# - add specfic CXXFLAGS for armv7h
+# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
+#        Romain Reignier <rom.reignier AT gmail.com>
+# - add specfic CXXFLAGS for armv7h and aarch64
 
-buildarch=4
+buildarch=12
 
 pkgname=intel-tbb
 pkgver=4.4_20150728
 _dir=tbb${pkgver/\./}oss
-pkgrel=1
+pkgrel=1.1
 pkgdesc='High level abstract threading library'
 arch=('i686' 'x86_64')
 url='http://www.threadingbuildingblocks.org/'
@@ -22,7 +23,8 @@ sha1sums=('9d8587f743a3ee3961305457a9285f71bb4168ea')
 
 build() {
   cd $_dir
-  CXXFLAGS+=" -DTBB_USE_GCC_BUILTINS=1 -D__TBB_64BIT_ATOMICS=0"
+  [[ $CARCH == "armv7h" ]] && CXXFLAGS+=" -DTBB_USE_GCC_BUILTINS=1 -D__TBB_64BIT_ATOMICS=0"
+  [[ $CARCH == "aarch64" ]] && CXXFLAGS+=" -DTBB_USE_GCC_BUILTINS=1 -D__TBB_64BIT_ATOMICS=1"
   make
 }