diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest
index 79a9753329..6fd54ebe15 100644
--- a/net-im/abaddon/Manifest
+++ b/net-im/abaddon/Manifest
@@ -1 +1 @@
-DIST abaddon-0.1.5.tar.gz 12814169 BLAKE2B 3c16bcd5d2330d2fd5aeed3174b32c7001ff2217e2846a9bdb48e3c69412f990a66723a9401d095bf2c9ab8e924b360537c9a6b6cccf889d52cfac42973ad567 SHA512 88ba4c11f2ed9dd9f5cfcc055f9192d43076e566f9e069764272dc0e7149b331af5df2f7c9dacbe826b7999193997f25da93bcbe5c087e566e089c4798459154
+DIST abaddon-0.1.6.tar.gz 22692605 BLAKE2B 6c08e114935db8f25559d26fc3f621f924d8c44cee9cf54cff78c1faec3e7d341061b8ee59de5fdf20f2a5989776a6a9cdf569b60f9d87a1d146af035e3dbf23 SHA512 de368f7759078e980f6e92bc684d75e104d5e87b3d917f5531fbc2b182e01daee975d355c4064241cd446e3892026817b0441e9eb08132acfc8c165a6574b940
diff --git a/net-im/abaddon/abaddon-0.1.5.ebuild b/net-im/abaddon/abaddon-0.1.6.ebuild
similarity index 68%
rename from net-im/abaddon/abaddon-0.1.5.ebuild
rename to net-im/abaddon/abaddon-0.1.6.ebuild
index a5247099ed..7ce6e5a7fa 100644
--- a/net-im/abaddon/abaddon-0.1.5.ebuild
+++ b/net-im/abaddon/abaddon-0.1.6.ebuild
@@ -14,6 +14,7 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="+libhandy"
 
 RDEPEND="
 	dev-cpp/gtkmm:3.0=
@@ -21,6 +22,7 @@ RDEPEND="
 	net-misc/curl
 	>=net-libs/ixwebsocket-11.0.8
 	sys-libs/zlib:=
+	libhandy? ( gui-libs/libhandy:= )
 "
 DEPEND="
 	${RDEPEND}
@@ -28,13 +30,22 @@ DEPEND="
 "
 BDEPEND=""
 
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_LIBHANDY="$(usex libhandy)"
+	)
+	cmake_src_configure
+}
+
 src_install() {
 	dodoc README.md
 
 	dobin "${BUILD_DIR}"/abaddon
 
 	insinto /usr/share/${PN}
-	doins -r res/*
+	# Explicit list, since 0.1.6 accidentally contains an archive of the resource files
+	# See https://github.com/uowuo/abaddon/pull/74
+	doins -r res/{css,fonts,res}
 
 	make_desktop_entry /usr/bin/${PN}
 }
diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml
index b8439200b0..fe43f96571 100644
--- a/net-im/abaddon/metadata.xml
+++ b/net-im/abaddon/metadata.xml
@@ -5,4 +5,7 @@
 		<name>Adrian Schollmeyer</name>
 		<email>nex+b-g-o@nexadn.de</email>
 	</maintainer>
+	<use>
+		<flag name="libhandy">Support for features using gui-libs/libhandy</flag>
+	</use>
 </pkgmetadata>