diff --git a/x11-misc/autorandr/Manifest b/x11-misc/autorandr/Manifest
new file mode 100644
index 0000000000..6523b0b03b
--- /dev/null
+++ b/x11-misc/autorandr/Manifest
@@ -0,0 +1 @@
+DIST autorandr-1.11.tar.gz 48791 BLAKE2B 57203b15eebdecab943c706745701e8569eb0a66dab69ae4429abfa863da736a5ed8b5333f6d948bcf8cae30f48c68eb1b35f2e84080526c1507ab78dba02efb SHA512 93de0461653aa5145956a8aafdc9fb257491495ca335e4213e7b6f1f313ebfd2332c38615ac648204494026439d77861a7eefd97e80cd49a5fe3d9b75db54ec1
diff --git a/x11-misc/autorandr/autorandr-1.11.ebuild b/x11-misc/autorandr/autorandr-1.11.ebuild
new file mode 100644
index 0000000000..b747e854c0
--- /dev/null
+++ b/x11-misc/autorandr/autorandr-1.11.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 systemd udev
+
+if [[ "${PV}" = "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/phillipberndt/${PN}.git"
+else
+	SRC_URI="https://github.com/phillipberndt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Automatically select a display configuration based on connected devices"
+HOMEPAGE="https://github.com/phillipberndt/autorandr"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="bash-completion systemd udev"
+
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+RDEPEND="
+	bash-completion? ( app-shells/bash )
+	systemd? ( sys-apps/systemd )
+	udev? ( virtual/udev )
+"
+
+src_install() {
+	targets="autorandr autostart_config"
+	if use bash-completion; then
+		targets="$targets bash_completion"
+	fi
+	if use systemd; then
+		targets="$targets systemd"
+	fi
+	if use udev; then
+		targets="$targets udev"
+	fi
+
+	emake DESTDIR="${D}" \
+		  install \
+		  BASH_COMPLETIONS_DIR="$(get_bashcompdir)" \
+		  SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" \
+		  UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		  TARGETS="$targets"
+}
+
+pkg_postinst() {
+	if use udev; then
+		udev_reload
+	fi
+}
diff --git a/x11-misc/autorandr/autorandr-9999.ebuild b/x11-misc/autorandr/autorandr-9999.ebuild
new file mode 100644
index 0000000000..b747e854c0
--- /dev/null
+++ b/x11-misc/autorandr/autorandr-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 systemd udev
+
+if [[ "${PV}" = "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/phillipberndt/${PN}.git"
+else
+	SRC_URI="https://github.com/phillipberndt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Automatically select a display configuration based on connected devices"
+HOMEPAGE="https://github.com/phillipberndt/autorandr"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="bash-completion systemd udev"
+
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+RDEPEND="
+	bash-completion? ( app-shells/bash )
+	systemd? ( sys-apps/systemd )
+	udev? ( virtual/udev )
+"
+
+src_install() {
+	targets="autorandr autostart_config"
+	if use bash-completion; then
+		targets="$targets bash_completion"
+	fi
+	if use systemd; then
+		targets="$targets systemd"
+	fi
+	if use udev; then
+		targets="$targets udev"
+	fi
+
+	emake DESTDIR="${D}" \
+		  install \
+		  BASH_COMPLETIONS_DIR="$(get_bashcompdir)" \
+		  SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" \
+		  UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		  TARGETS="$targets"
+}
+
+pkg_postinst() {
+	if use udev; then
+		udev_reload
+	fi
+}
diff --git a/x11-misc/autorandr/metadata.xml b/x11-misc/autorandr/metadata.xml
new file mode 100644
index 0000000000..e052391d26
--- /dev/null
+++ b/x11-misc/autorandr/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>flo@geekplace.eu</email>
+	<name>Florian Schmaus</name>
+</maintainer>
+<use>
+	<flag name="systemd">Install autorand systemd files</flag>
+	<flag name="udev">Use udev for monitor detection</flag>
+</use>
+</pkgmetadata>