diff --git a/device/main/device-pine64-pinephone/asound.conf b/device/main/device-pine64-pinephone/00_alsa_pinephone_dshare.conf
similarity index 100%
rename from device/main/device-pine64-pinephone/asound.conf
rename to device/main/device-pine64-pinephone/00_alsa_pinephone_dshare.conf
diff --git a/device/main/device-pine64-pinephone/APKBUILD b/device/main/device-pine64-pinephone/APKBUILD
index 7134181ea..286e8a187 100644
--- a/device/main/device-pine64-pinephone/APKBUILD
+++ b/device/main/device-pine64-pinephone/APKBUILD
@@ -5,13 +5,18 @@
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-pine64-pinephone
 pkgver=0.18
-pkgrel=0
+pkgrel=1
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh $pkgname-ofono"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-ofono
+	$pkgname-phosh
+	$pkgname-shelli
+	"
 depends="
 	alsa-ucm-conf
 	atinout
@@ -29,10 +34,10 @@ depends="
 makedepends="devicepkg-dev"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
+	00_alsa_pinephone_dshare.conf
 	10-pinephone-proximity.rules
 	70-wifi-pm.rules
 	90-modem-eg25.rules
-	asound.conf
 	deviceinfo
 	gpsd_device-hook.sh
 	gpsd_pinephone.initd
@@ -51,7 +56,16 @@ provides="$pkgname-elogind=$pkgver-r$pkgrel"
 
 build() {
 	devicepkg_build $startdir $pkgname
-	mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n postmarketos -d "$srcdir"/uboot-script.cmd "$srcdir"/boot.scr
+	mkimage \
+		-A arm \
+		-O linux \
+		-T script \
+		-C none \
+		-a 0 \
+		-e 0 \
+		-n postmarketos \
+		-d "$srcdir"/uboot-script.cmd \
+		"$srcdir"/boot.scr
 }
 
 package() {
@@ -59,8 +73,9 @@ package() {
 	install -Dm644 "$srcdir"/boot.scr \
 		"$pkgdir"/boot/boot.scr
 
-	# Make /boot/allwinner/sun50i-a64-pine64-pinephone*.dtb resolve to /boot/sun50i-a64-pine64-pinephone*.dtb
-	# this is because the device tree names in u-boot include the vendor and the one in postmarketOS doesn't
+	# Make /boot/allwinner/sun50i-a64-pine64-pinephone*.dtb resolve to
+	# /boot/sun50i-a64-pine64-pinephone*.dtb. This is because the device tree
+	# names in u-boot include the vendor and the one in postmarketOS doesn't.
 	ln -s .. "$pkgdir"/boot/allwinner
 
 	install -Dm644 "$srcdir"/hwtest.ini \
@@ -75,14 +90,11 @@ package() {
 		"$pkgdir"/usr/lib/udev/rules.d/10-pinephone-proximity.rules
 
 	# Fix "sysrq: HELP..." messages in dmesg while playing audio
-	# (Headphone output interferes with the serial console on the headphone jack)
+	# (Headphone output interferes with the serial console on the headphone
+	# jack)
 	install -Dm644 "$srcdir"/sysrq.conf \
 		"$pkgdir"/etc/sysctl.d/sysrq.conf
 
-	# Alsa default audio must be stereo
-	install -Dm644 "$srcdir"/asound.conf \
-		"$pkgdir"/etc/asound.conf
-
 	# Alsa usecase manager config
 	install -Dm644 "$srcdir"/PinePhone.conf \
 		"$pkgdir"/usr/share/alsa/ucm2/PinePhone/PinePhone.conf
@@ -94,10 +106,12 @@ package() {
 	# Modem
 	install -Dm755 "$srcdir"/setup-modem.sh \
 		"$pkgdir"/usr/bin/pinephone_setup-modem
-	install -Dm644 "$srcdir"/90-modem-eg25.rules -t "$pkgdir"/usr/lib/udev/rules.d/
+	install -Dm644 "$srcdir"/90-modem-eg25.rules -t \
+		"$pkgdir"/usr/lib/udev/rules.d/
 
 	# Wifi / PM
-	install -Dm644 "$srcdir"/70-wifi-pm.rules -t "$pkgdir"/usr/lib/udev/rules.d/
+	install -Dm644 "$srcdir"/70-wifi-pm.rules -t \
+		"$pkgdir"/usr/lib/udev/rules.d/
 }
 
 ofono() {
@@ -110,20 +124,33 @@ ofono() {
 
 nonfree_firmware() {
 	pkgdesc="Wifi, Bluetooth and Autofocus firmware"
-	depends="linux-firmware-rtlwifi linux-firmware-rtl_bt firmware-pine64-rtl8723bt firmware-pine64-ov5640"
+	depends="
+		linux-firmware-rtlwifi
+		linux-firmware-rtl_bt
+		firmware-pine64-rtl8723bt
+		firmware-pine64-ov5640
+		"
 	mkdir "$subpkgdir"
 }
 
 phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
 	depends="wys-pinephone"
 	mkdir "$subpkgdir"
 }
 
-sha512sums="b53cc6f2531854cc9c1e4c334185a20551d64c8675ee8a8eaa03b99d80808fad421a0f6e99e5be212a974d88c85f461a71ba59ac59c29f298c82f211e3be1ef4  10-pinephone-proximity.rules
+shelli() {
+	install_if="$pkgname=$pkgver-r$pkgrel shelli"
+
+	# Alsa default audio must be stereo
+	install -Dm644 "$srcdir"/00_alsa_pinephone_dshare.conf \
+		"$subpkgdir"/etc/alsa/conf.d/00_alsa_pinephone_dshare.conf
+}
+
+sha512sums="5736444fd38ab4351d148ae96c479085f469bd1e51a692fb1827f8ac921a584389f7696985e1fba21c2deac88709910531f4ece282f45ff54e590c2b54b84ba3  00_alsa_pinephone_dshare.conf
+b53cc6f2531854cc9c1e4c334185a20551d64c8675ee8a8eaa03b99d80808fad421a0f6e99e5be212a974d88c85f461a71ba59ac59c29f298c82f211e3be1ef4  10-pinephone-proximity.rules
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 7dc2b7c20b4a2b15f597a6417bd01797643dad84a3683b0dee648e030fb6326e9d020307643fdcdf1bb43fc44af9975697e417003bd359610bae2d8ce614fc00  90-modem-eg25.rules
-5736444fd38ab4351d148ae96c479085f469bd1e51a692fb1827f8ac921a584389f7696985e1fba21c2deac88709910531f4ece282f45ff54e590c2b54b84ba3  asound.conf
 4043b326d5d4f5f82a4a4e2cc44fe6692a13d21555c812698da887a24c08cc20738cb85094bfbd2d6c84189e0d36292d2d8afbcc22e33ce8e13808eceb7a3c56  deviceinfo
 ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd46444dd3c0a637ec08ce6125b18240fe6bfc13f624a15192e648  gpsd_device-hook.sh
 1017fc3f325227da58c77abdc59e9735288d91a7ccc63ec784fe0241c523786b617a11ce8045dab2a74ca12a7dd70aaa334af91836418db1e96a3266fecaa4fd  gpsd_pinephone.initd