diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
index 2a901b710..be8de2c21 100644
--- a/sys-apps/usbguard/Manifest
+++ b/sys-apps/usbguard/Manifest
@@ -1 +1,2 @@
 DIST usbguard-0.7.2.tar.gz 1025446 BLAKE2B e0ac650ff7eb79c122db921ed25c64750041906d100ff6fc26178aabafd19c3102d01e42a0c5082585c5b4ba8360263238845488ac3f4efa1aecc9fbc076dc44 SHA512 befe82deb9a6a73fe835acef9f196a887324e73439d1b9abc5e874bbab5ced1480cf6bda842eb87f0cef2acb7bd77800def0f3ee3fc71736d0aeb29a10c5b9d3
+DIST usbguard-0.7.4.tar.gz 1043630 BLAKE2B f34227f08aedb52b753dc6eaea0e56120f6779b7c16d520f77020e06ab2e80f255e34206c59d4275051844c2351da0005972325830ee0639f5ab9cd365be4845 SHA512 7138361e16e57f88609b1db2b80721c5cb4c09b9a6b9e17c915b4866ee9f9fa2e34f3576838a804123ef75a54abfa6f6e2fb5988180a9a86f50f8d6779ac6688
diff --git a/sys-apps/usbguard/usbguard-0.7.4.ebuild b/sys-apps/usbguard/usbguard-0.7.4.ebuild
new file mode 100644
index 000000000..351449b5a
--- /dev/null
+++ b/sys-apps/usbguard/usbguard-0.7.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="The USBGuard software framework helps to protect your computer against BadUSB."
+HOMEPAGE="https://github.com/dkopecek/usbguard"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://github.com/dkopecek/${PN}.git"
+	EGIT_SUBMODULES=( src/ThirdParty/Catch src/ThirdParty/PEGTL src/ThirdParty/usbmon )
+	KEYWORDS=""
+else
+	KEYWORDS="~x86 ~amd64"
+	SRC_URI="https://github.com/USBGuard/usbguard/archive/${P}.tar.gz"
+	S=${WORKDIR}/${PN}-${PN}-${PV}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps-ng crypt dbus policykit protobuf qt5 seccomp systemd"
+
+DEPEND="sys-cluster/libqb
+	sys-libs/libseccomp
+	sys-libs/libcap-ng
+	dev-libs/protobuf
+	dev-ruby/asciidoctor
+	dev-cpp/catch
+	<=dev-libs/pegtl-2.0
+	systemd? ( sys-apps/systemd )
+	dbus? ( sys-apps/dbus
+		dev-libs/dbus-glib )
+	policykit? ( sys-auth/polkit )
+	qt5? ( dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtcore:5 )
+	crypt? ( || ( dev-libs/libgcrypt:0 dev-libs/libsodium ) )
+	seccomp? ( sys-libs/libseccomp )
+	caps-ng? ( sys-libs/libcap-ng )
+	protobuf? ( dev-libs/protobuf )
+	"
+
+RDEPEND="${DEPEND}
+	virtual/udev"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+#	local myconf=()
+	econf $(use_enable systemd) \
+		$(use_with dbus) \
+		--with-gui-qt=$(usex qt5 qt5) \
+		$(use_with policykit polkit) \
+		--disable-dependency-tracking
+#		"${myconf[@]}"
+}
+
+src_compile() {
+	if use qt5; then
+		export QT_SELECT=qt5
+	fi
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use systemd ; then
+		systemd_dounit usbguard.service
+	fi
+
+	insinto /etc/usbguard
+	doins usbguard-daemon.conf
+
+	keepdir /var/lib/log/usbguard
+}
+
+pkg_postinst() {
+	elog "You will need to allow access to your user for accessing the QT gui."
+	elog "Execute as root. usbguard add-user YOUR_USERNAME --devices ALL --exceptions ALL"
+}