diff --git a/device/testing/device-samsung-i9100/APKBUILD b/device/testing/device-samsung-i9100/APKBUILD
index 1b300a99a..4bcb96c22 100644
--- a/device/testing/device-samsung-i9100/APKBUILD
+++ b/device/testing/device-samsung-i9100/APKBUILD
@@ -2,10 +2,10 @@
 # Contributor: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-samsung-i9100
 pkgver=1
-pkgrel=26
+pkgrel=27
 pkgdesc="Samsung Galaxy SII"
 url="https://postmarketos.org"
-arch="armhf"
+arch="armv7"
 license="MIT"
 depends="postmarketos-base linux-samsung-i9100 libsamsung-ipc mesa-dri-swrast"
 makedepends="devicepkg-dev"
@@ -33,5 +33,5 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="254cb016e7a90da540214cb77b3801333f84c7fc488b30e32ffc477a0302b9685bd967d559fde11891cfe36d93a9ad0041a64dad6ad1080355f0a345b47c9ccc  deviceinfo
+sha512sums="906ec6fe4552fb6eb2d0c330637e4249ac4ef51f9fab53a47fb0dc288a56ca3aae4e6393a6f5c05ac6345748f79369c604fcac4355e017a558197a205ebddea9  deviceinfo
 089635daddd88eec35451bfe98dc3713035e3623c896dd21305b990ecf422e8fbb54e010cf347919bbb3a7385f639ab119280477fe0783df3228168d97d96fc6  90-android-touch-dev.rules"
diff --git a/device/testing/device-samsung-i9100/deviceinfo b/device/testing/device-samsung-i9100/deviceinfo
index c004f4c2e..052ff1921 100644
--- a/device/testing/device-samsung-i9100/deviceinfo
+++ b/device/testing/device-samsung-i9100/deviceinfo
@@ -10,7 +10,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_storage="true"
 deviceinfo_flash_method="heimdall-isorec"
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_keyboard="false"
diff --git a/device/testing/linux-samsung-i9100/APKBUILD b/device/testing/linux-samsung-i9100/APKBUILD
index 9960249bc..99a87843c 100644
--- a/device/testing/linux-samsung-i9100/APKBUILD
+++ b/device/testing/linux-samsung-i9100/APKBUILD
@@ -3,16 +3,16 @@
 
 pkgname=linux-samsung-i9100
 pkgver=3.0.101
-pkgrel=13
+pkgrel=14
 pkgdesc="Samsung Galaxy SII kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="samsung-i9100"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev
-	findutils busybox-static-armhf"
+	findutils busybox-static-armv7"
 
 # Source
 _repository="android_kernel_samsung_smdk4412"
@@ -68,7 +68,7 @@ package() {
 }
 
 sha512sums="285ffd2c82d0444b99da583573d19443b73de22d7382aae54413af229a28bebf4ea32ecbe248ae54ae64bbbc0af7d722b1ef86d5dd099e2990dcc6284fb195fa  linux-samsung-i9100-349a3e91e76d17e67ef6213e1f6712e700695631.tar.gz
-087372ce82f8eae44694d7c6288822e5565c6bbed3a07cb42a6b009fa25a84a16ec44d76fe5f504bcf945e28237e1d62cf3686d1a60126525e3fdea2613cbb3c  config-samsung-i9100.armhf
+087372ce82f8eae44694d7c6288822e5565c6bbed3a07cb42a6b009fa25a84a16ec44d76fe5f504bcf945e28237e1d62cf3686d1a60126525e3fdea2613cbb3c  config-samsung-i9100.armv7
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
 dd4094d5f4ec281d32f12af88cb22a782e497c8e52f69cf60b73ac7d6171fc95f1f8040b3d0ad2ff3f016d22ac1d91c5b522e5d03203534a76742bc55a082af5  init"
diff --git a/device/testing/linux-samsung-i9100/config-samsung-i9100.armhf b/device/testing/linux-samsung-i9100/config-samsung-i9100.armv7
similarity index 100%
rename from device/testing/linux-samsung-i9100/config-samsung-i9100.armhf
rename to device/testing/linux-samsung-i9100/config-samsung-i9100.armv7
diff --git a/firmware/firmware-samsung-i9100/APKBUILD b/firmware/firmware-samsung-i9100/APKBUILD
index fb863accf..bade99d63 100644
--- a/firmware/firmware-samsung-i9100/APKBUILD
+++ b/firmware/firmware-samsung-i9100/APKBUILD
@@ -1,9 +1,9 @@
 pkgname=firmware-samsung-i9100
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Samsung Galaxy S II Firmware"
 url="https://github.com/TheMuppets/proprietary_vendor_samsung"
-arch="armhf"
+arch="armv7"
 license="proprietary"
 options="!check"
 
@@ -20,7 +20,6 @@ _files="
 "
 _commit="a5346c8874d5186c967b74291c2055d902f7a928"
 _url="https://github.com/TheMuppets/proprietary_vendor_samsung/raw/$_commit/i9100/proprietary/system/etc/wifi"
-source=""
 for _i in $_files; do
 	source="$source $pkgname-$_commit-$_i::$_url/$_i";
 done