diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest
index f08c7aa..54bcb8c 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -2,21 +2,22 @@
 Hash: SHA256
 
 DIST nemu-2.6.0_p20210413.tar.gz 122374 BLAKE2B 87e7b39f6c4a70719c58c5bfc1353adc74bcfe498b9a80a16ceb74268d58619d50643b672d8b907cd409a164770cf7b06f8a1f97b503adfeb8bd297ea188d04e SHA512 a33f9ef72d70ca3af13397c873ae60d2c40e74491d46988116809c3caec76413d4a310c9c1e98416c6a0f170c0760563b008b41f813b5861799c8379303ce4ad
+DIST nemu-2.6.0_p20210430.tar.gz 122607 BLAKE2B 6d2cde97486f1e6431b55cc6ff017de326511781ccddbfcd5c2b347daca9d2cbb7dc991ff9647e49d2da2d00d85fec886d35f9754bc7067af059375398a37173 SHA512 0a6ca374c835cb6cac81383bdf6bbee87039b427b6379914dfaccd8ebd0dbe8de55524ddce8f20552bbf43ddbbd77a654efc0c49344e779c9e98895879f76207
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCAB9FiEEcg3s4uUa4XE72XWQvF3CmYqtKyEFAmCDWNtfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEcg3s4uUa4XE72XWQvF3CmYqtKyEFAmCX1vpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDcy
 MERFQ0UyRTUxQUUxNzEzQkQ5NzU5MEJDNURDMjk5OEFBRDJCMjEACgkQvF3CmYqt
-KyHjOhAAjoVI9vhmsgZY50uXwkTmbYnzxgTs5JJHv0S61misXo0FFfUeSSf4k4Qp
-h6S8NHKugjmyA6AltxjW7X9f2/Qa+M8so+8t1W+LAVq33xtpELhvNgmUX8nMicU3
-f7L/FVjVESyN0pHuZ49/9gPtPd80+NEDCDMbtRvOcKI/UC8Sdu2WENo4LN9nYL36
-j596UuQpLYr8Ov7CHX3IlTCAgJHcWnR9NZPre05QxkbJ5lpYolTrrI96AE4Ee9QA
-Amvup/zOuAYTKv3+GqgfNhRofQ4pOzZs09poiJL6otuyUnOkIOWfEnnLXjKNwnjo
-xrpWkn54eu0KrhP+L3lOL7mzRHTq4mzb6kce/OTGimKE67n4tyGSXGkLz0qLJmJF
-SYIbckwmooQWOCrh3k1Uyn8dpc3C+GK+7DrJzU4tW/rsbEEBIeU+Z00q2I308TYa
-MbHUeYNN+Ur4g8cE1wGgIddPXL1UF2ShmQIhkpNxl4vknIetY+zP7RrJvHnT0wZ4
-t1K2fodVpYKCByUEf6iWfh9qnIgfBEwFS9qbn79t1C5oVTkssy399/fe7XltSoUF
-bQwaAk0wBcQWFZZq/yNY0dGMdk2+ExU2L/ZmtKJs1mwvd/CmPDlfKf+05drPalPr
-q7aBXrWsdlZ1xAA2LUNmJOaXalDBIW9UQlD63QNdHkhluKEInSQ=
-=O0R+
+KyFp2g//dDbTnFbGF/8EGDEVZbB1Ba0RxBOM2l4nhFucgBPD74DR9JMhpVha5cG4
+2CDU4z4RwGbaDwS+4nvVsKi4nLtiXvf0Q8N4N23OrXz9kIG9Knfoo4h2YhSjJnr0
+kEt/MYDmpICDaXW0TaaQigz3F+YdT5vt2zHhaRYC3GqcDCfK5NX61iIg/ZnQLkb6
+mJs6j5M3RohjU8yYFTVyew8SBTOX/EErSocaFwpdC71scE5v8sifNdggx72fNGId
+sv1dIPTdvG05UKNjql9JTb40ewqmR8kHpBrKMw40cTT05AyF9uW1K1IkAT6oyfXW
+vCsXp2UUopCKVT9HeBrHR3m+m1ve5AsGm/CI2u6ya7MyVUaHvdBh/Kq23TLfN9W4
+BPYAUygNLDQvesWWF9u7dJlWBbvPREgloTLcqc/e5ABV/8WLb0Rg9COVXRu8PVr9
+IExoE12mZU0Pr6OLdMl6SM1tirOi8UpLy/ll55YaesB764eECTFms6WanglvohYM
+i2dDOqgy6k5y6879u9l0FFxZwHWCE4MOfWnUmsd7c32YoPYosPH1YUpPI3YhCvf+
+ao9nAY5KEbALULAo2S0Pr1nJUFxOy0xfFLgHFhyR+PqE3cyb23O0KrkE6sm2D1af
+EhW4WzCYT1T6OZImnoOW6AhiYsg7HGh5eiCFiM44aj9I6ou9ox8=
+=mOF0
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/nemu/nemu-2.6.0_p20210430.ebuild b/app-emulation/nemu/nemu-2.6.0_p20210430.ebuild
new file mode 100644
index 0000000..551ea2f
--- /dev/null
+++ b/app-emulation/nemu/nemu-2.6.0_p20210430.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info
+
+MY_PV="${PV/_rc/-RC}"
+COMMIT_ID="b8ba242e36e4121b4a6056950ac85d655486e495"
+
+DESCRIPTION="ncurses interface for QEMU"
+HOMEPAGE="https://github.com/nemuTUI/nemu"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/nemuTUI/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]]; then
+		SRC_URI="https://github.com/nemuTUI/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${COMMIT_ID}"
+		KEYWORDS="~amd64 ~x86"
+	else
+		SRC_URI="https://github.com/nemuTUI/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+		KEYWORDS="~amd64 ~x86"
+		S="${WORKDIR}/$PN-${MY_PV}/"
+	fi
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="dbus network-map +ovf +savevm spice +vnc-client"
+
+RDEPEND="
+	app-emulation/qemu[vnc,virtfs,spice?]
+	dev-db/sqlite:3=
+	sys-libs/ncurses:0=[unicode]
+	virtual/libusb:1
+	virtual/libudev:=
+	dbus? ( sys-apps/dbus )
+	network-map? ( media-gfx/graphviz[svg] )
+	ovf? (
+		dev-libs/libxml2:2
+		app-arch/libarchive
+	)
+	spice? ( app-emulation/virt-viewer )
+	vnc-client? ( net-misc/tigervnc )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+pkg_pretend() {
+	if use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel"
+		else
+			CONFIG_CHECK="~VETH ~MACVTAP"
+			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
+			ERROR_VETH+=" into your kernel or loaded as a module to use the"
+			ERROR_VETH+=" local network settings feature."
+			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
+			check_extra_config
+		fi
+	fi
+}
+
+src_configure() {
+	# -DNM_USE_UTF: Enable unicode unconditionally. We already
+	#                depended on ncurses[unicode].
+	# -DNM_WITH_QEMU: Do not embbed qemu.
+	local mycmakeargs=(
+		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
+		-DNM_USE_UTF=on
+		-DNM_WITH_DBUS=$(usex dbus)
+		-DNM_WITH_NETWORK_MAP=$(usex network-map)
+		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
+		-DNM_WITH_QEMU=off
+		-DNM_WITH_SPICE=$(usex spice)
+		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "For non-root usage execute script:"
+	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
+	elog "and add udev rule:"
+	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /etc/udev/rules.d"
+	elog "Afterwards reboot or reload udev with"
+	elog "udevadm control --reload-rules && udevadm trigger"
+}