diff --git a/x11-misc/portfolio/metadata.xml b/x11-misc/portfolio/metadata.xml
index 097975e..bfe880a 100644
--- a/x11-misc/portfolio/metadata.xml
+++ b/x11-misc/portfolio/metadata.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">tchx84/Portfolio</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/x11-misc/portfolio/portfolio-0.9.2.ebuild b/x11-misc/portfolio/portfolio-0.9.2.ebuild
index 1cae9dd..c4f90f9 100644
--- a/x11-misc/portfolio/portfolio-0.9.2.ebuild
+++ b/x11-misc/portfolio/portfolio-0.9.2.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999* ]]; then
 else
 	SRC_URI="https://github.com/tchx84/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN^}-${PV}"
+	S="${WORKDIR}/${P^}"
 fi
 
 RESTRICT="
@@ -36,15 +36,15 @@ RDEPEND="
 		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 	')
+"
+DEPEND="
+	${RDEPEND}
 	test? (
 		dev-python/black
 		dev-python/pyflakes
 		dev-python/pytest
 	)
 "
-DEPEND="
-	${RDEPEND}
-"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -54,6 +54,7 @@ src_install() {
 	meson_src_install
 	python_optimize
 
+	# TODO: find a better way to fix the python script
 	echo "#!/usr/bin/${EPYTHON}
 	$(cat ${D}/usr/bin/dev.tchx84.Portfolio)" > "${D}/usr/bin/dev.tchx84.Portfolio" || die
 }
diff --git a/x11-misc/portfolio/portfolio-9999.ebuild b/x11-misc/portfolio/portfolio-9999.ebuild
index 1cae9dd..c4f90f9 100644
--- a/x11-misc/portfolio/portfolio-9999.ebuild
+++ b/x11-misc/portfolio/portfolio-9999.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999* ]]; then
 else
 	SRC_URI="https://github.com/tchx84/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN^}-${PV}"
+	S="${WORKDIR}/${P^}"
 fi
 
 RESTRICT="
@@ -36,15 +36,15 @@ RDEPEND="
 		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 	')
+"
+DEPEND="
+	${RDEPEND}
 	test? (
 		dev-python/black
 		dev-python/pyflakes
 		dev-python/pytest
 	)
 "
-DEPEND="
-	${RDEPEND}
-"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -54,6 +54,7 @@ src_install() {
 	meson_src_install
 	python_optimize
 
+	# TODO: find a better way to fix the python script
 	echo "#!/usr/bin/${EPYTHON}
 	$(cat ${D}/usr/bin/dev.tchx84.Portfolio)" > "${D}/usr/bin/dev.tchx84.Portfolio" || die
 }