diff --git a/device/testing/device-asus-flo/APKBUILD b/device/testing/device-asus-flo/APKBUILD
index 367770996..b7a76a8f2 100644
--- a/device/testing/device-asus-flo/APKBUILD
+++ b/device/testing/device-asus-flo/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
+maintainer="Eric Anderson <ejona86@gmail.com>"
 pkgname=device-asus-flo
-pkgver=6
+pkgver=7
 pkgrel=0
 pkgdesc="Google Nexus 7 2013 (flo)"
 url="https://postmarketos.org"
@@ -17,7 +17,7 @@ subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-udev
 "
-source="deviceinfo kernel-cmdline.conf 90-android-touch-dev.rules wpa_supplicant.conf pointercal"
+source="deviceinfo kernel-cmdline.conf kernel-cmdline-workaround.conf 90-android-touch-dev.rules wpa_supplicant.conf pointercal"
 
 options="!check !archcheck"
 
@@ -29,6 +29,10 @@ package() {
 	devicepkg_package $startdir $pkgname
 	install -D -m644 "$srcdir"/wpa_supplicant.conf \
 		"$pkgdir"/etc/wpa_supplicant/wpa_supplicant.conf
+	# Feed the whacky bootloader that eats 26 characters.
+	# Must sort before 00-base.conf
+	install -D -m644 "$srcdir/kernel-cmdline-workaround.conf" \
+		"$pkgdir/usr/lib/kernel-cmdline.d/00-aaa-$pkgname-workaround.conf"
 	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/90-android-touch-dev.rules
 	install -D -m644 "$srcdir"/pointercal \
@@ -67,8 +71,9 @@ nonfree_firmware() {
 }
 
 sha512sums="
-f509dac69625e684d17419226c4cd25694bb81c36f0dcedfb72cb9e5a499fb4468fb5ac263db6a58478276c85410aba6a563dccca42038eb43213015bf70f7f4  deviceinfo
-355605a0fa4cd0f131ca8f3f57be664e3a1afc2ae198f7ccf6f147bdf8c38462000fb9a65b6c7f4e6f3e9233d2f7b7db826a067d9615bad147b02874c6f364d6  kernel-cmdline.conf
+56aeb6716e2306b89df858d12b71aa682629876ef41d8a9d8d246ab5bca0cb73143fd65adbb517eef6029912d7ab1590703f6991dc61c4f924a408aded420afe  deviceinfo
+18f40d7308eb327de4b8ea5552fef3874e6f3f2e2da7dba4244e954ce866ed8658a6809177488aca6387149c0014782d5a10634881f72301fbefbe3743702faa  kernel-cmdline.conf
+ebc11da9dbafca1b7052ff58d1782e9e48508e3f338656e817f42e6da40cbed198ee9ec3093909012733b82ca26b0f9b07e3f1aea63500a90855823aa31ee465  kernel-cmdline-workaround.conf
 5ac89b627f52d2f1103c3329bd905cdbb906cae5bb332d52e6805d7971fbcc0faabe1fd9d2beb7c6de4e4487c05047eaa17852dbf9e114ee3c5d4b0d57d73859  90-android-touch-dev.rules
 3278921cc1617d10fdd13dfbeaf213cda0078d069e727acd8cfac10bd8ade6f373be1e22fd1e4b50ae71cd2eae09f7d6aad5de42338d9ea9f8c1a34f0b60cb69  wpa_supplicant.conf
 cf913217b41a3dde8bc2a16a5bc82013c85679de0e81db1cfc36f2409ea034fec430082ddcb207c16746453601cf8381300b049cd2fb131f1916dc7dbcc247e3  pointercal
diff --git a/device/testing/device-asus-flo/deviceinfo b/device/testing/device-asus-flo/deviceinfo
index 37b30c63a..17349f6eb 100644
--- a/device/testing/device-asus-flo/deviceinfo
+++ b/device/testing/device-asus-flo/deviceinfo
@@ -19,7 +19,6 @@ deviceinfo_screen_height="1920"
 # Fastboot related
 deviceinfo_generate_bootimg="true"
 deviceinfo_flash_offset_base="0x80200000"
-# Feed the whacky bootloader that eats 26 characters
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02000000"
 deviceinfo_flash_offset_second="0x00f00000"
diff --git a/device/testing/device-asus-flo/kernel-cmdline-workaround.conf b/device/testing/device-asus-flo/kernel-cmdline-workaround.conf
new file mode 100644
index 000000000..fd125d824
--- /dev/null
+++ b/device/testing/device-asus-flo/kernel-cmdline-workaround.conf
@@ -0,0 +1 @@
+xxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/device/testing/device-asus-flo/kernel-cmdline.conf b/device/testing/device-asus-flo/kernel-cmdline.conf
index ced0652d8..f5f7355f0 100644
--- a/device/testing/device-asus-flo/kernel-cmdline.conf
+++ b/device/testing/device-asus-flo/kernel-cmdline.conf
@@ -1,4 +1,4 @@
-xxxxxxxxxxxxxxxxxxxxxxxxxxconsole=ttyMSM0,115200,n8
+console=ttyMSM0,115200,n8
 user_debug=31
 msm_rtb.filter=0x3F
 ehci-hcd.park=3