diff --git a/device/device-samsung-maguro/APKBUILD b/device/device-samsung-maguro/APKBUILD
index bdac014c5..c5205b7f3 100644
--- a/device/device-samsung-maguro/APKBUILD
+++ b/device/device-samsung-maguro/APKBUILD
@@ -1,10 +1,10 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-maguro
-pkgver=2
-pkgrel=22
+pkgver=3
+pkgrel=0
 pkgdesc="Google Galaxy Nexus (GSM)"
 url="https://postmarketos.org"
-arch="armhf"
+arch="armv7"
 license="MIT"
 depends="postmarketos-base linux-samsung-maguro mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
@@ -27,4 +27,4 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="e2be45ed1495d007c28ff5736fc6e0ebdedf0147d5c78b6574cf3c63ea43594a82ef86cf033d87f3fa4058d0b4cdb8e35b1b13b58c81dc28f83165ef00426c71  deviceinfo"
+sha512sums="1173263d7e39ab361089672c7342c616174e341fe7bbbb2dde46f8e40dd57161e9019c95971ae80f5d931a12a4b8db6bf271c0134ad137a7810f1fc34a9b1d3c  deviceinfo"
diff --git a/device/device-samsung-maguro/deviceinfo b/device/device-samsung-maguro/deviceinfo
index 1caf6ceb8..0eb27e007 100644
--- a/device/device-samsung-maguro/deviceinfo
+++ b/device/device-samsung-maguro/deviceinfo
@@ -12,7 +12,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_storage="false"
 deviceinfo_flash_method="fastboot"
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 deviceinfo_dev_touchscreen="/dev/input/event1"
 
 # Splash screen
diff --git a/device/linux-samsung-maguro/APKBUILD b/device/linux-samsung-maguro/APKBUILD
index 6644fb3b1..d3ebb5f1f 100644
--- a/device/linux-samsung-maguro/APKBUILD
+++ b/device/linux-samsung-maguro/APKBUILD
@@ -2,9 +2,9 @@
 
 pkgname="linux-samsung-maguro"
 pkgver=3.0.31
-pkgrel=12
+pkgrel=13
 pkgdesc="Samsung Galaxy Nexus kernel from LineageOS"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="samsung-maguro"
 url="https://github.com/LineageOS/android_kernel_samsung_tuna"
@@ -24,7 +24,7 @@ fi
 # Source
 _repository="android_kernel_samsung_tuna"
 _commit="e14e5fe679a63eef92346cde874175d8b62b6a4a"
-_config="config-${_flavor}.armhf"
+_config="config-${_flavor}.armv7"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/LineageOS/${_repository}/archive/${_commit}.tar.gz
 	$_config
@@ -59,7 +59,7 @@ package() {
 }
 
 sha512sums="f117b3202c3db1a575598fd87ee27080db5c447c986ced677b63e6b00613ebfab58d634bf63b8bcf0c229eb0bec4dc81b13d7cfda3c2aee62e9ed8e26eeb860c  linux-samsung-maguro-e14e5fe679a63eef92346cde874175d8b62b6a4a.tar.gz
-eb9bd3f80fd57a0f8be7e5236f4bc8d32159dae635327e656e598c48438e07e81085b4b687a325f18941fbea4d558c2408f8852f6f528500bd682a4f89c6bf22  config-samsung-maguro.armhf
+eb9bd3f80fd57a0f8be7e5236f4bc8d32159dae635327e656e598c48438e07e81085b4b687a325f18941fbea4d558c2408f8852f6f528500bd682a4f89c6bf22  config-samsung-maguro.armv7
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
 d8cdc1137e6a4ad78a3a31acc40f0c98f4db272eaf5b90ee850abb83b80916c4ff3c18a0a181e94eebead44213f6314e3363d0c4b91d95ee1adafbcad6dc57ab  android_paranoid_network.patch
 65eb11dca6645073885228af6aae6efa40b6f063fd04157b501acf40368bf331dd701f746ed187659f654a9354ddf304aaefca8ffc9ea2b00c145c61162e1189  fix_old_perl_code.patch"
diff --git a/device/linux-samsung-maguro/config-samsung-maguro.armhf b/device/linux-samsung-maguro/config-samsung-maguro.armv7
similarity index 100%
rename from device/linux-samsung-maguro/config-samsung-maguro.armhf
rename to device/linux-samsung-maguro/config-samsung-maguro.armv7