diff --git a/device/device-sony-amami/APKBUILD b/device/device-sony-amami/APKBUILD
index b33be1a2e..8e196a11d 100644
--- a/device/device-sony-amami/APKBUILD
+++ b/device/device-sony-amami/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-sony-amami
 pkgver=1
-pkgrel=11
+pkgrel=12
 pkgdesc="Sony Xperia Z1 Compact"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-sony-amami mkbootimg"
+depends="linux-sony-amami mkbootimg firmware-sony-amami"
 makedepends=""
 install=""
 subpackages=""
diff --git a/firmware/firmware-sony-amami/APKBUILD b/firmware/firmware-sony-amami/APKBUILD
new file mode 100644
index 000000000..80cfff919
--- /dev/null
+++ b/firmware/firmware-sony-amami/APKBUILD
@@ -0,0 +1,42 @@
+_files="wcnss.b00 wcnss.b01 wcnss.b02 wcnss.b04 wcnss.b06 wcnss.b07 wcnss.b08 wcnss.b09 wcnss.mdt"
+_files1="WCNSS_cfg.dat WCNSS_qcom_cfg.ini WCNSS_qcom_wlan_nv.bin"
+
+pkgname=firmware-sony-amami
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware files for Xperia Z1 Compact"
+url="https://github.com/TheMuppets/proprietary_vendor_sony"
+arch="all"
+license="proprietary"
+depends="wcnss-wlan"
+makedepends=""
+install=""
+subpackages=""
+source=""
+for _i in $_files
+do
+	source="$source https://github.com/TheMuppets/proprietary_vendor_sony/raw/cm-14.1/rhine-common/proprietary/etc/firmware/$_i"
+done
+for _i in $_files1
+do
+	source="$source https://github.com/TheMuppets/proprietary_vendor_sony/raw/cm-14.1/rhine-common/proprietary/etc/firmware/wlan/prima/$_i"
+done
+options="!strip !check"
+
+package() {
+	mkdir -p $pkgdir/lib/firmware/postmarketos
+	for _i in $_files; do install -D -m644 "$srcdir/$_i" "$pkgdir/lib/firmware/postmarketos/$_i"; done
+	for _i in $_files1; do install -D -m644 "$srcdir/$_i" "$pkgdir/lib/firmware/postmarketos/wlan/prima/$_i"; done
+}
+sha512sums="dadeef01a73e997926143af3c7b9dec03399958ed2447d7b42f3a1764337c5bd17368b77f0e3a9ea371083895815e9cb2eee4884348c78abb7c96609398e24a3  wcnss.b00
+c0982fd64bc65b4b926989af743e4fa2183caa8e77b9302547cd0449862a84e640fe412640d1566d9f7e5c7f60a880ab4f0ffefc2ded87d5dee534136e872180  wcnss.b01
+7b2540a56478fe88d05420808584d2968dc7402a3df6aadd4954c506f6e547490b4df0d4e9c4f35b874ad041caed7e857ddc3ab39abce4a7151eef5187744c22  wcnss.b02
+98a6005379b7eba296fe0d47e018d054dcd9340d6c1268c0b304519224c2845f9d76dc14324edc351a70af13305cc8ae884e489969519ea0ff8d74585d78653f  wcnss.b04
+79f93c73210c18e6084f28fb32558c2b0d9d24bda12d21121db309dc962f5d8687b7d8c55c88235972829132f71d96dc4528fdabc75105a2a9ed60180e633802  wcnss.b06
+0b6cbac838dfe7f47ea1bd0df00ec282fdf45510c92161072ccfb84035390c4da743d9c3b954eaa1b0f86fc9861b23cc6c8667ab232c11c686432ebb5c8c3f27  wcnss.b07
+6033893c75b32cc906bcabdff02fdbbbb75f0b4d568962b38ea023c00b2273f90bce4482358d4ecc64c22bceaa628d55d17877c8301a1406f67c55c86fc08723  wcnss.b08
+e260f244e3655fbf480511189303ce85c014638278ea59f85e2eaa043f5c13162ccdbd75ada9490add38b9bb7675e77532c3d915926c91ba03b83bb44465d73f  wcnss.b09
+308ee0be85f1caa728687d5d8ca56f547acf63a05d46b38e49c0a4307326088d92b9c567e496d220b5132f1a03e0e6d8ab5b6e56f6dbe4119a66be74d2c8182d  wcnss.mdt
+62306e85731554865190a6fd73de59bdb27b544825d4df3434c6fc392adf1869bcab9070ce2f60a55a82598ada06e33345ee3f9ae28eb0371fb441a3f58be2cb  WCNSS_cfg.dat
+3a5effd450762dcda6515a9fb5e92c2c0c97043cb0078bd1bafebb397681959550aa06685dee43135faec2475aef9fbbc7f998f49c284338d6007ebcf9d88bed  WCNSS_qcom_cfg.ini
+aeb68eb2c62297121c50115e536dd4c39bd323bbf1c83cb8a1fd65e4703d1b979588da7d715dcfde330ce3a85e698235206b9bf0e7e09e875707e5265d31adac  WCNSS_qcom_wlan_nv.bin"
diff --git a/main/wcnss-wlan/APKBUILD b/main/wcnss-wlan/APKBUILD
new file mode 100644
index 000000000..7d8c0ee9b
--- /dev/null
+++ b/main/wcnss-wlan/APKBUILD
@@ -0,0 +1,19 @@
+pkgname=wcnss-wlan
+pkgver=1
+pkgrel=0
+pkgdesc="Init script for enabling wcnss wlan driver (downstream Android kernels)"
+url="https://github.com/postmarketOS/pmbootstrap"
+arch="noarch"
+license="GPL3+"
+depends=""
+makedepends=""
+install="$pkgname.post-install"
+subpackages=""
+source="wcnss-wlan.initd $install"
+options=""
+
+package() {
+	install -Dm755 "$srcdir/wcnss-wlan.initd" "$pkgdir/etc/init.d/wcnss-wlan"
+}
+sha512sums="ad063d2cd240ac9e63e80f46b3bac57937071cf59dbfd9937e25d6e3bd15df66e035c80bdf60bdaacbade9e488e7d1a3f7401c031081204611cec80dff9a0640  wcnss-wlan.initd
+767cc4a51fbe52bc8874cd4b74c262b59fb8f1daad529f27bc81795d76e5765a8535dfa5cd5b236d76dcbd675716ee070899cc0bac7cc3dda461991221b0f334  wcnss-wlan.post-install"
diff --git a/main/wcnss-wlan/wcnss-wlan.initd b/main/wcnss-wlan/wcnss-wlan.initd
new file mode 100644
index 000000000..f201e5df8
--- /dev/null
+++ b/main/wcnss-wlan/wcnss-wlan.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+
+description="Initialize wcnss wlan driver"
+
+depend()
+{
+	need udev
+	before wpa_supplicant
+}
+
+start()
+{
+	ebegin "Enabling wlan driver"
+	echo 1 > /dev/wcnss_wlan 2>/dev/null
+	echo sta > /sys/module/wlan/parameters/fwpath
+}
diff --git a/main/wcnss-wlan/wcnss-wlan.post-install b/main/wcnss-wlan/wcnss-wlan.post-install
new file mode 100644
index 000000000..7a0291abd
--- /dev/null
+++ b/main/wcnss-wlan/wcnss-wlan.post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Enable wcnss-wlan init script
+rc-update add wcnss-wlan default