diff --git a/app-crypt/yubioath-desktop/Manifest b/app-crypt/yubioath-desktop/Manifest
index 8c7bbb570..417ade4e8 100644
--- a/app-crypt/yubioath-desktop/Manifest
+++ b/app-crypt/yubioath-desktop/Manifest
@@ -1 +1,3 @@
 DIST yubioath-desktop-3.0.1.tar.gz 269800 SHA256 91a32ec635de390b312c8d8b8194b2e5ea4a453d1e4c1f5295b6654fd16176af SHA512 c302b7476af352d9a7e8466fe8d845a9c9d6b4b324b498714345e3b22e9e1244a820e79b10ff12e7a30dcf0bc8065b84893249491f677e639f27993ef65bc8c5 WHIRLPOOL e8b329ed6a200c803db11291425240c421f56972be88de39c4b0232593bd99d45e502300ea0a61498893d943a379a2d9881f17fb41ba88cbdd3495a2290933d6
+DIST yubioath-desktop-3.1.0.tar.gz 268909 SHA256 7caae0fd3b14529476eda3a5660bc050584b298ddc3c8d1adfe221041fa5db49 SHA512 47b2e4719eb37123230c1dd4b2694dd4a8079028bd77112edcd3a0a2fb2c269cba819622d195a7b4d2baad44504b29b691343f683b413d5c696efef0a7c24f97 WHIRLPOOL ddaea460653b90ac3f53886991f0a32c251145704b122b9ed0224fd6e3ae938ffc48598d59ca961e53b0e2461a905be3199ea92a78fce34ef61169f2e35df204
+DIST yubioath-desktop-4.1.0.tar.gz 310233 SHA256 eb208e83cd057471536a1a9444876d84b354a6706044f404168f50b56052fdd1 SHA512 b41968c3c9e793232fc3fef563a2677baf2610d055f7b5d6876e58c584c2209858613fea7ecf56f43a35d6be15297516720af24fe2c21167943900dc15c1183c WHIRLPOOL b32e2f49caaf4cd14e991f95387ff493847e2bddedf47b4de365b050facf3da8cd1cbe44e2b756096f9211778410d5f935f6870d5f0f44e3649a10d80ce66124
diff --git a/app-crypt/yubioath-desktop/files/qtsingleapp.patch b/app-crypt/yubioath-desktop/files/qtsingleapp.patch
new file mode 100644
index 000000000..24e44abb9
--- /dev/null
+++ b/app-crypt/yubioath-desktop/files/qtsingleapp.patch
@@ -0,0 +1,11 @@
+--- yubioath-desktop.pro.orig	2017-04-10 18:33:30.000000000 +0800
++++ yubioath-desktop.pro	2017-04-20 20:44:41.000000000 +0800
+@@ -40,7 +40,7 @@
+ 
+ # Mac doesn't use qSingleApplication
+ !macx {
+-    include(vendor/qt-solutions/qtsingleapplication/src/qtsingleapplication.pri)
++    CONFIG += qtsingleapplication
+ }
+ 
+ # Icon file
diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-3.0.1.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-3.1.0.ebuild
similarity index 78%
rename from app-crypt/yubioath-desktop/yubioath-desktop-3.0.1.ebuild
rename to app-crypt/yubioath-desktop/yubioath-desktop-3.1.0.ebuild
index 8b5a3244d..ca2ff328e 100644
--- a/app-crypt/yubioath-desktop/yubioath-desktop-3.0.1.ebuild
+++ b/app-crypt/yubioath-desktop/yubioath-desktop-3.1.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 DESCRIPTION="Library and tool for personalization of Yubico's YubiKey NEO"
 SRC_URI="http://opensource.yubico.com/yubioath-desktop/releases/${P}.tar.gz"
@@ -28,6 +27,6 @@ DEPEND="${RDEPEND}"
 src_install()
 {
 	distutils-r1_src_install || die
-	domenu resources/yubioath.desktop || die
-	doicon resources/yubioath.xpm || die
+	domenu resources/yubioath.desktop
+	doicon resources/yubioath.xpm
 }
diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-4.1.0.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-4.1.0.ebuild
new file mode 100644
index 000000000..90410d05a
--- /dev/null
+++ b/app-crypt/yubioath-desktop/yubioath-desktop-4.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Library and tool for personalization of Yubico's YubiKey NEO"
+SRC_URI="http://opensource.yubico.com/yubioath-desktop/releases/${P}.tar.gz"
+HOMEPAGE="http://opensource.yubico.com/yubioath-desktop"
+
+#KEYWORDS="~amd64"
+SLOT="4"
+LICENSE="BSD-2"
+USE="broken"
+
+RDEPEND="dev-qt/qtsingleapplication"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+src_prepare() {
+	epatch ${FILESDIR}/qtsingleapp.patch
+	eapply_user
+}
+
+src_configure() {
+	eqmake5 yubioath-desktop.pro
+	python build_qrc.py resources.json
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+#    python_optimize  # does all packages by default
+	domenu resources/yubioath.desktop
+	doicon resources/icons/yubioath.png
+
+	emake compiler_rcc_make_all
+	emake compiler_buildqrc_make_all
+	emake compiler_moc_header_make_all
+
+}
diff --git a/profiles/pentoo/base/package.accept_keywords/app-crypt b/profiles/pentoo/base/package.accept_keywords/app-crypt
index bcc9c91f0..b7d65a7e2 100644
--- a/profiles/pentoo/base/package.accept_keywords/app-crypt
+++ b/profiles/pentoo/base/package.accept_keywords/app-crypt
@@ -1,5 +1,7 @@
 ~app-crypt/acsccid-1.1.0
 
+~app-crypt/yubikey-manager-0.3.1
+
 =app-crypt/yubioath-desktop-3*
 ~app-crypt/ccid-1.4.25