diff --git a/app-mobilephone/pinephone-meta/metadata.xml b/app-mobilephone/pinephone-meta/metadata.xml
new file mode 100644
index 0000000000..26d4a22e25
--- /dev/null
+++ b/app-mobilephone/pinephone-meta/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<use>
+		<flag name="eg25-manager">Enable eg25 modem manager</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-mobilephone/pinephone-meta/pinephone-meta-0.1.ebuild b/app-mobilephone/pinephone-meta/pinephone-meta-0.1.ebuild
new file mode 100644
index 0000000000..41bbec0982
--- /dev/null
+++ b/app-mobilephone/pinephone-meta/pinephone-meta-0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd udev
+
+DESCRIPTION="Meta-package for installing phosh on pinephone"
+HOMEPAGE="https://gitlab.manjaro.org/manjaro-arm/packages/community/phosh/pinephone-manjaro-tweaks.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~arm64"
+IUSE="+eg25-manager"
+
+RDEPEND="
+	gnome-extra/iio-sensor-proxy
+	gui-wm/phosh-meta
+	app-mobilephone/usb-tethering
+	media-libs/alsa-ucm-pinephone
+	media-tv/v4l-utils
+	sys-firmware/anx7688-firmware
+	sys-firmware/rtl8723bt-firmware
+	sys-firmware/ov5640-firmware
+	x11-themes/sound-theme-librem5
+	eg25-manager? (
+		net-misc/eg25-manager
+		>=app-mobilephone/pinephone-modem-scripts-0.20.3-r5
+	)
+	!eg25-manager? (
+		<=app-mobilephone/pinephone-modem-scripts-0.20.3-r4
+		!net-misc/eg25-manager
+	)
+	sys-boot/osk-sdl
+"
diff --git a/sys-firmware/pinephone-firmware/Manifest b/sys-firmware/pinephone-firmware/Manifest
new file mode 100644
index 0000000000..2af7efe4ae
--- /dev/null
+++ b/sys-firmware/pinephone-firmware/Manifest
@@ -0,0 +1 @@
+DIST pinephone-firmware-20201030.tar.gz 21318 BLAKE2B a74649ec4bce9d9601a6989dd083a9253db5f48aadfe98c17099a1c616a63b46cc60e25218d9eb7915c6d9f9ec69f72639a5ca61cbbc0934cf5bf212b063c773 SHA512 a31f7da484961caa47315ef8125f9e49963342b7ee94877bb181c6aa3f704dce46980a1543878a12a635c2b488fe1e1e87c064640ff4a1443757a126809bbb74
diff --git a/sys-firmware/pinephone-firmware/metadata.xml b/sys-firmware/pinephone-firmware/metadata.xml
new file mode 100644
index 0000000000..144c8091cf
--- /dev/null
+++ b/sys-firmware/pinephone-firmware/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-firmware/pinephone-firmware/pinephone-firmware-20201030.ebuild b/sys-firmware/pinephone-firmware/pinephone-firmware-20201030.ebuild
new file mode 100644
index 0000000000..ed2adeadeb
--- /dev/null
+++ b/sys-firmware/pinephone-firmware/pinephone-firmware-20201030.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Firmwares files for PinePhone"
+HOMEPAGE="https://xff.cz/git/linux-firmware"
+SRC_URI="https://github.com/scardracs/gentoo-packages/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="linux-fw-redistributable no-source-code"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+S="${WORKDIR}"
+
+src_install() {
+	mkdir -p "${D}"/lib/firmware/ || die
+	insinto /lib/firmware/
+	doins anx7688-fw.bin
+	doins ov5640-fw.bin
+	doins rtl8723cs-fw.bin
+}