diff --git a/app-emulation/waydroid/metadata.xml b/app-emulation/waydroid/metadata.xml
new file mode 100644
index 0000000000..07f40006d9
--- /dev/null
+++ b/app-emulation/waydroid/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>denis7774@gmail.com</email>
+		<name>Denis Reva</name>
+		<description>rarogcmex</description>
+	</maintainer>
+	<longdescription lang="en">
+		Waydroid uses Linux namespaces (user, pid, uts, net, mount, ipc) to run a full Android system in a container and provide Android applications on any GNU/Linux-based platform.
+
+		The Android system inside the container has direct access to any needed hardware.
+
+		The Android runtime environment ships with a minimal customized Android system image based on LineageOS. The image is currently based on Android 11.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">waydroid/waydroid</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emulation/waydroid/waydroid-1.3.4.ebuild b/app-emulation/waydroid/waydroid-1.3.4-r1.ebuild
similarity index 79%
rename from app-emulation/waydroid/waydroid-1.3.4.ebuild
rename to app-emulation/waydroid/waydroid-1.3.4-r1.ebuild
index 15651371ea..f2cc64a065 100644
--- a/app-emulation/waydroid/waydroid-1.3.4.ebuild
+++ b/app-emulation/waydroid/waydroid-1.3.4-r1.ebuild
@@ -39,16 +39,5 @@ ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating Android-s
 ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers, therefore it's vital for android-specific memory management"
 src_install() {
 	python_fix_shebang waydroid.py
-	mv waydroid.py waydroid || die
-	python_doscript waydroid
-	python_domodule tools
-	python_domodule data
-	insinto "/usr/share/applications"
-	doins "data/Waydroid.desktop"
-	insinto "/etc/gbinder.d"
-	doins "gbinder/anbox.conf"
-	if use systemd; then
-		insinto "/usr/lib/systemd/system"
-		doins "debian/waydroid-container.service"
-	fi
+	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
 }