diff --git a/extra/x265/PKGBUILD b/extra/x265/PKGBUILD
index 32f407ddc..6f158c827 100644
--- a/extra/x265/PKGBUILD
+++ b/extra/x265/PKGBUILD
@@ -5,12 +5,13 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - patch to attempt fixing ARM hackery by bandwagoning developers
+#  - retain 10/12 bit separation for AArch64
 
 pkgname=x265
-pkgver=2.5
+pkgver=2.6
 pkgrel=1
 pkgdesc='Open Source H265/HEVC video encoder'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://bitbucket.org/multicoreware/x265'
 license=('GPL')
 depends=('gcc-libs')
@@ -18,17 +19,17 @@ makedepends=('yasm' 'cmake')
 provides=('libx265.so')
 source=("https://bitbucket.org/multicoreware/x265/downloads/x265_${pkgver}.tar.gz"
         arm.patch)
-sha256sums=('2e53259b504a7edb9b21b9800163b1ff4c90e60c74e23e7001d423c69c5d3d17'
+sha256sums=('1bf0036415996af841884802161065b9e6be74f5f6808ac04831363e2549cdbf'
             'c3e80d7261d5fef72bfea5c5dd4613c1e997315dc7d0d9465f99356287a8d46b')
 
 prepare() {
-  cd x265_${pkgver}
+  cd x265_v${pkgver}
 
   patch -p1 -i ../arm.patch
   [[ $CARCH == "aarch64" ]] && CFLAGS+=" -fPIC" && CXXFLAGS+=" -fPIC"
   [[ $CARCH == "arm" ]] && CONFIG="-DENABLE_ASSEMBLY=OFF"
 
-  for d in 8 $([[ $CARCH == 'x86_64' ]] && echo "10 12"); do
+  for d in 8 $([[ $CARCH == 'aarch64' ]] && echo "10 12"); do
     if [[ -d build-$d ]]; then
       rm -rf build-$d
     fi
@@ -37,9 +38,9 @@ prepare() {
 }
 
 build() {
-  if [[ $CARCH == x86_64 ]]; then
+  if [[ $CARCH == aarch64 ]]; then
 
-    cd x265_${pkgver}/build-12
+    cd x265_v${pkgver}/build-12
 
     cmake ../source \
       -DCMAKE_INSTALL_PREFIX='/usr' \
@@ -70,14 +71,14 @@ build() {
       -DENABLE_SHARED='TRUE' \
       -DENABLE_HDR10_PLUS='TRUE' \
       -DEXTRA_LIB='x265_main10.a;x265_main12.a' \
-      -DEXTRA_LINK_FLAGS='-L.' \
+      -DEXTRA_LINK_FLAGS='-L .' \
       -DLINKED_10BIT='TRUE' \
       -DLINKED_12BIT='TRUE'
     make
 
   else
 
-    cd x265_${pkgver}/build-8
+    cd x265_v${pkgver}/build-8
 
     cmake ../source \
       -DCMAKE_INSTALL_PREFIX='/usr' \
@@ -88,7 +89,7 @@ build() {
 }
 
 package() {
-  cd x265_${pkgver}/build-8
+  cd x265_v${pkgver}/build-8
 
   make DESTDIR="${pkgdir}" install
 }