diff --git a/gui-apps/swaylock-blur/swaylock-blur-0.3.1.ebuild b/gui-apps/swaylock-blur/swaylock-blur-0.3.1.ebuild
index dc0ab7cdff..0d483294b7 100644
--- a/gui-apps/swaylock-blur/swaylock-blur-0.3.1.ebuild
+++ b/gui-apps/swaylock-blur/swaylock-blur-0.3.1.ebuild
@@ -66,7 +66,7 @@ SRC_URI="
 RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS=""  # Upstream has archived the project, use swaylock-effects instead
 IUSE=""
 
 DEPEND="
@@ -76,3 +76,8 @@ DEPEND="
 	gui-wm/sway
 "
 RDEPEND="${RDEPEND}"
+
+pkg_postinst() {
+	ewarn "gui-apps/swaylock-blur is deprecated"
+	ewarn "in favor of gui-apps/swaylock-effects."
+}
diff --git a/gui-apps/swaylock-effects/Manifest b/gui-apps/swaylock-effects/Manifest
new file mode 100644
index 0000000000..8d7ac51e68
--- /dev/null
+++ b/gui-apps/swaylock-effects/Manifest
@@ -0,0 +1,2 @@
+DIST swaylock-effects-1.6.0.tar.gz 609458 BLAKE2B 3efe72d9124b410fe4a6c6d751716f9dbc7aaf9357786b3e87171ef12c9eb8f01425fa86247b940316708214195faf49df3b5cfdbe884ebf88367915da2868eb SHA512 9e93ee9dc8f5e984a195abc50937125b19cd9fec8f71a373430980d6995510947c71bf3c3c26152ef3d4fe2c39f8d875c249aa8ec085d60c670d94b633dcea83
+DIST swaylock-effects-1.6.1.tar.gz 616395 BLAKE2B 1d66fe012f6a5c7202a5ad73344e50bb7544680cb9414bc0b93ab7cec835dee6887ef09fb89bebb5df4ffb35a2f6e8ecbe5ff418f976d870edb7485deefcf40c SHA512 5b2e2537e683e50814a4dc5c2109a902a9f9533c13d2d656e965694a01111727dd819420c979d323d6d0353b03111782064ecc61d712479049d1df9ff84f30bb
diff --git a/gui-apps/swaylock-effects/metadata.xml b/gui-apps/swaylock-effects/metadata.xml
new file mode 100644
index 0000000000..aadb0e3edb
--- /dev/null
+++ b/gui-apps/swaylock-effects/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <name>Matthias Coppens</name>
+        <email>coppens.matthias.abc@gmail.com</email>
+    </maintainer>
+    <use>
+        <flag name="fish-completion">Enable fish completion support</flag>
+        <flag name="gdk-pixbuf">Enable additional image format support via the <pkg>x11-libs/gdk-pixbuf</pkg> library</flag>
+        <flag name="man">Build and install man pages</flag>
+    </use>
+    <upstream>
+        <remote-id type="github">mortie/swaylock-effects</remote-id>
+        <bugs-to>https://github.com/mortie/swaylock-effects/issues</bugs-to>
+    </upstream>
+</pkgmetadata>
diff --git a/gui-apps/swaylock-effects/swaylock-effects-1.6.0.ebuild b/gui-apps/swaylock-effects/swaylock-effects-1.6.0.ebuild
new file mode 100644
index 0000000000..01f13fbb5f
--- /dev/null
+++ b/gui-apps/swaylock-effects/swaylock-effects-1.6.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Swaylock, with fancy effects"
+HOMEPAGE="https://github.com/mortie/swaylock-effects"
+
+if [[ ${PV} == 9999 ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mortie/swaylock-effects.git"
+else
+	MY_PV="$(ver_rs 2 -)"
+	S="${WORKDIR}/swaylock-effects-${MY_PV}"
+	SRC_URI="https://github.com/mortie/swaylock-effects/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion"
+
+RESTRICT="mirror"
+
+DEPEND="
+	!gui-apps/swaylock
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+	pam? ( sys-libs/pam )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dpam=$(usex pam enabled disabled)
+		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if ! use pam; then
+		fcaps cap_sys_admin usr/bin/swaylock
+	fi
+}
diff --git a/gui-apps/swaylock-effects/swaylock-effects-1.6.1.ebuild b/gui-apps/swaylock-effects/swaylock-effects-1.6.1.ebuild
new file mode 100644
index 0000000000..10e238b74f
--- /dev/null
+++ b/gui-apps/swaylock-effects/swaylock-effects-1.6.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Swaylock, with fancy effects"
+HOMEPAGE="https://github.com/mortie/swaylock-effects"
+
+if [[ ${PV} == 9999 ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mortie/swaylock-effects.git"
+else
+	MY_PV="$(ver_rs 2 -)"
+	S="${WORKDIR}/swaylock-effects-${MY_PV}"
+	SRC_URI="https://github.com/mortie/swaylock-effects/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion"
+
+RESTRICT="mirror"
+
+DEPEND="
+	!gui-apps/swaylock
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+	pam? ( sys-libs/pam )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/gcc-9
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dpam=$(usex pam enabled disabled)
+		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if ! use pam; then
+		fcaps cap_sys_admin usr/bin/swaylock
+	fi
+}
diff --git a/gui-apps/swaylock-effects/swaylock-effects-9999.ebuild b/gui-apps/swaylock-effects/swaylock-effects-9999.ebuild
new file mode 100644
index 0000000000..10e238b74f
--- /dev/null
+++ b/gui-apps/swaylock-effects/swaylock-effects-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Swaylock, with fancy effects"
+HOMEPAGE="https://github.com/mortie/swaylock-effects"
+
+if [[ ${PV} == 9999 ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mortie/swaylock-effects.git"
+else
+	MY_PV="$(ver_rs 2 -)"
+	S="${WORKDIR}/swaylock-effects-${MY_PV}"
+	SRC_URI="https://github.com/mortie/swaylock-effects/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion"
+
+RESTRICT="mirror"
+
+DEPEND="
+	!gui-apps/swaylock
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+	pam? ( sys-libs/pam )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/gcc-9
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dpam=$(usex pam enabled disabled)
+		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if ! use pam; then
+		fcaps cap_sys_admin usr/bin/swaylock
+	fi
+}