diff --git a/device/device-oneplus-bacon/APKBUILD b/device/device-oneplus-bacon/APKBUILD
index e0bf6d63c..f68137c74 100644
--- a/device/device-oneplus-bacon/APKBUILD
+++ b/device/device-oneplus-bacon/APKBUILD
@@ -1,9 +1,9 @@
 pkgname=device-oneplus-bacon
 pkgver=1
-pkgrel=15
+pkgrel=16
 pkgdesc="OnePlus One"
 url="https://postmarketos.org"
-arch="armhf"
+arch="armv7"
 license="MIT"
 depends="postmarketos-base linux-oneplus-bacon mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends=""
@@ -25,6 +25,6 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
-sha512sums="fa3efe1892f70b8a17111cf0cfb81a9bfa122c7384f8c794a0b5ced1766d689b749e24055bc423f26bb9023b9e81c66055846c1db3217897d6b22396246f7501  deviceinfo
+sha512sums="36d071db3def878a617eb69735464a9cb55bb211e6f798629f5bfb321cc4d945878f6154da85bac7c7f21fd6997c3ae418c32ab0b080b9429167a77bb35c79b5  deviceinfo
 65e9ee7352b1dc39d99ea411eb0ed9c56f9975230907db5add3a1b4146cdf6f227c934052dab38a1937ed67d67585f28fb7410f10a1bec9dd5e4eb69d7253515  90-android-touch-dev.rules
 86a0c08720225e4532f797ad69307dfff66867e4a35de1aacceefc48f19721caf93f9a17a268e58f1f5a7e947f157d6984676837c2b5b835b0caf6ee9821bb5a  weston.ini"
diff --git a/device/device-oneplus-bacon/deviceinfo b/device/device-oneplus-bacon/deviceinfo
index 0f20fd3a5..fb345c4bf 100644
--- a/device/device-oneplus-bacon/deviceinfo
+++ b/device/device-oneplus-bacon/deviceinfo
@@ -12,7 +12,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_storage="false"
 deviceinfo_flash_method="fastboot"
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Splash screen
 deviceinfo_screen_width="1080"
diff --git a/device/linux-oneplus-bacon/APKBUILD b/device/linux-oneplus-bacon/APKBUILD
index 156c7762d..6849161a9 100644
--- a/device/linux-oneplus-bacon/APKBUILD
+++ b/device/linux-oneplus-bacon/APKBUILD
@@ -14,7 +14,7 @@
 _vendor=oneplus
 _flavor=oneplus-bacon
 _version="dd65620ba04a8c6ba0e30553c9c95388daefae02"
-_config="config-${_flavor}.armhf"
+_config="config-${_flavor}.armv7"
 
 pkgname=linux-${_flavor}
 pkgver=3.4.113
@@ -22,8 +22,8 @@ case $pkgver in
 	*.*.*) _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=14
-arch="armhf"
+pkgrel=15
+arch="armv7"
 pkgdesc="LineageOS 14.1 kernel for OnePlus One (bacon)"
 url="https://github.com/LineageOS/android_kernel_oneplus_msm8974"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev xz dtbtool gcc6"
@@ -121,7 +121,7 @@ package() {
 }
 
 sha512sums="94d0048439e70b11637a7a122e8652d4e997ee413d6e54ea0aed7f2c68e137fcc19b6784dcc0dedf0b80240ba16060634b517d5865ec6c7222e4dea44d3c059a  linux-oneplus-bacon-dd65620ba04a8c6ba0e30553c9c95388daefae02.tar.gz
-5af9714a0cb47d5e1f72d4b691de7f52bcc1cb7907bd2f939409c626a7b2950e2dfe1c1b31adaf0b6ae3a7078554a7b52f0e73b600641507a5962168bee3641f  config-oneplus-bacon.armhf
+a3cb2ac5a990954f4bb314754f075c3fb42b6583f3e4a79b77f296313b3fdcbcd8d2a1a4be7de5c2508e2ef3be96ba52bb4d0b91a6c0f54d4aeb023efa25a800  config-oneplus-bacon.armv7
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
 a48336bbfead6ad0c84d2fce0c40a3f5530aebdff356a6835cceaf59a50a6f860d2f8027703a92927955fbb18857ba78788e010d017bf67730f069b36e96fe87  0001-fix-video-argb-setting.patch
diff --git a/device/linux-oneplus-bacon/config-oneplus-bacon.armhf b/device/linux-oneplus-bacon/config-oneplus-bacon.armv7
similarity index 99%
rename from device/linux-oneplus-bacon/config-oneplus-bacon.armhf
rename to device/linux-oneplus-bacon/config-oneplus-bacon.armv7
index 53aac37f4..1c4eb401c 100644
--- a/device/linux-oneplus-bacon/config-oneplus-bacon.armhf
+++ b/device/linux-oneplus-bacon/config-oneplus-bacon.armv7
@@ -3585,7 +3585,7 @@ CONFIG_CRYPTO_SHA512_ARM_NEON=y
 #
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_ARM=y
-CONFIG_CRYPTO_AES_ARM_BS=y
+CONFIG_CRYPTO_AES_ARM_BS=n
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_ARC4=y
 # CONFIG_CRYPTO_BLOWFISH is not set