diff --git a/device/device-samsung-klte/APKBUILD b/device/device-samsung-klte/APKBUILD
index 19a847eb05366324dbc5f0ccca426963d205b21c..563122218fdc29433464298399dfc31be293cd72 100644
--- a/device/device-samsung-klte/APKBUILD
+++ b/device/device-samsung-klte/APKBUILD
@@ -2,10 +2,10 @@
 pkgname="device-samsung-klte"
 pkgdesc="Samsung Galaxy S5"
 pkgver=0.2
-pkgrel=4
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
@@ -35,4 +35,4 @@ kernel_mainline() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
-sha512sums="f810d1ff1089824ace21c9b4da990bf802b6cd0f6247b5ad2b7434e504e427bb6d6f6171e3a6e6f2c1204c5e9e3d48e9c7a3141e7c1ae4b0ab4ad402cd923eba  deviceinfo"
+sha512sums="186911ec5eb189826aa515e467d95270adbb1ae0eef36133a1ec3928ddab38a1cbd1bbbeaf2965bc02f5b1d1b603e360229c54fd9118b40558ab9e8066a72448  deviceinfo"
diff --git a/device/device-samsung-klte/deviceinfo b/device/device-samsung-klte/deviceinfo
index c0e5ebc16e554cd3d4f2b5274f756a6a932a7851..cb8aba7131d6d098a8d53e6e6f41a075995f4c42 100644
--- a/device/device-samsung-klte/deviceinfo
+++ b/device/device-samsung-klte/deviceinfo
@@ -8,7 +8,7 @@ deviceinfo_codename="samsung-klte"
 deviceinfo_date=""
 deviceinfo_dtb="qcom-msm8974-samsung-klte"
 deviceinfo_modules_initfs=""
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_keyboard="false"
diff --git a/device/linux-samsung-klte/APKBUILD b/device/linux-samsung-klte/APKBUILD
index a3891a89a11c9c843b30724eed6a0e8254649863..e9ef102adbedcfa4c6d0ce37b9cc2f70a0b48387 100644
--- a/device/linux-samsung-klte/APKBUILD
+++ b/device/linux-samsung-klte/APKBUILD
@@ -5,9 +5,9 @@
 
 pkgname="linux-samsung-klte"
 pkgver=3.4.113
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy S5 kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="samsung-klte"
 url="https://kernel.org"
@@ -80,7 +80,7 @@ package() {
 }
 
 sha512sums="a0ed01d4beb4fd1b304ea1409e4e3d7ff60662de34999dcdb2901cb10eef217a6679d5cc42dfcc9c3e2b9fb96bc38a8adc431444092310e22af29c7d581f60af  linux-samsung-klte-7a3b6080ee8d411acc2bb4a08de479aa8cc9c77a.tar.gz
-3045e613475bcdb454315450c86ca3198787ff0f4573a61118a6a600048d1d9b45d6c83c1804d4945bcf24af8759a038d9f2b5bf57aa7ab8b3585be65ffd4f7a  config-samsung-klte.armhf
+fef4b697b2af03f750016e521ac36f68e1e383b4900c9e55dc275ab9be802fb1095fc5c4bcb50d24d2983ed4675b3f1c659086c1f5c38f9d58b55453ac5ae6ad  config-samsung-klte.armv7
 3b4913415bcfe0ff222969f993890c656c7e12b6ee06532bded485d5201c9855b2c87996c5b63423702b89b6b0ca214b5aceeb402571d9c5af084093c157ccb4  00_fix_return_address.patch
 0fc4b1782dfd3bd94fa9ae8ab74b19713f25e9f4a48dcf830072634f247aa3dd8847f001a3e87e9728e057657efd4ae751510e7c408d9b960c907665ca64e61f  01_gpu-msm-fix-gcc5-compile.patch
 b55fc9ab3e21bc85d66ee08d7e1cd7fdc3b236249212fbcd0055e60ed3e6cef3e4d2b8058a4b7d70c78b2bbc7a11111b55d4d82490b4e3579b8e61657806ac09  02-Reduce-battery-and-touchscreen-log-spam.patch"
diff --git a/device/linux-samsung-klte/config-samsung-klte.armhf b/device/linux-samsung-klte/config-samsung-klte.armv7
similarity index 99%
rename from device/linux-samsung-klte/config-samsung-klte.armhf
rename to device/linux-samsung-klte/config-samsung-klte.armv7
index 565ba3bfa82c58770aecdd6a5ae9b4270f9ad1af..be1bdaa499d3c1183648dec8735d54e516bd440d 100644
--- a/device/linux-samsung-klte/config-samsung-klte.armhf
+++ b/device/linux-samsung-klte/config-samsung-klte.armv7
@@ -4616,7 +4616,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