diff --git a/media-video/onvifviewer/Manifest b/media-video/onvifviewer/Manifest
deleted file mode 100644
index 55986bf..0000000
--- a/media-video/onvifviewer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST onvifviewer-v0.12.tar.gz 764434 BLAKE2B d945702c243283fe7c0b0d15ef8c440788896aa5377d11574a46af6b0e04e558a449ac83120f3ecab8d12c5bfa176fd7621866bdf6888e9e839b1d1edc50bfde SHA512 d2caf9af493334cbc212b568b88083377399e11076e3d31be00b960ea1f39048f07a37c645c9644db0ed57308ae268b6ddbb4f43ff9a6d6a9a639ac4075fbe4b
diff --git a/media-video/onvifviewer/onvifviewer-0.12-r3.ebuild b/media-video/onvifviewer/onvifviewer-0.12-r3.ebuild
deleted file mode 100644
index 031dd09..0000000
--- a/media-video/onvifviewer/onvifviewer-0.12-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils
-
-DESCRIPTION="Viewer for IP cameras ONVIF"
-HOMEPAGE="https://gitlab.com/caspermeijn/onvifviewer/"
-SRC_URI="https://gitlab.com/caspermeijn/onvifviewer/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
-RESTRICT="primaryuri"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="kde-frameworks/extra-cmake-modules:5
-	kde-frameworks/kirigami:5
-	net-libs/kdsoap:5
-	net-misc/kdsoap-ws-discovery-client:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtdbus:5
-	dev-qt/qtxml:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtsvg:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kauth:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kcodecs:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kxmlgui:5"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-pkg_postinst()
-{
-	xdg_desktop_database_update
-}
-
-pkg_postrm()
-{
-	xdg_desktop_database_update
-}
diff --git a/www-misc/onvifviewer/Manifest b/www-misc/onvifviewer/Manifest
new file mode 100644
index 0000000..667bb57
--- /dev/null
+++ b/www-misc/onvifviewer/Manifest
@@ -0,0 +1 @@
+DIST onvifviewer-c0ac7f6bb62333dedf1fb59c0d7c9351dfc1e0b1.tar.gz 773623 BLAKE2B 93d57192dad41605cc21b96c1c98df2673b8feadcedba76264eb346c30a186dab8851142ecc4da62fda60571b85a10ce88b35b084856160adbc0630d6c7a9b9d SHA512 421485f12c3c20c0831258dbf0560430ee4bc872f13695c29c4a8cd1bd31468dcbcf2526b3abbefcbfa0f42d8385b5aa73924b61cf6d99772fb3374b84b1bd95
diff --git a/media-video/onvifviewer/metadata.xml b/www-misc/onvifviewer/metadata.xml
similarity index 100%
rename from media-video/onvifviewer/metadata.xml
rename to www-misc/onvifviewer/metadata.xml
diff --git a/media-video/onvifviewer/onvifviewer-0.12-r2.ebuild b/www-misc/onvifviewer/onvifviewer-0.13_pre20200507.ebuild
similarity index 74%
rename from media-video/onvifviewer/onvifviewer-0.12-r2.ebuild
rename to www-misc/onvifviewer/onvifviewer-0.13_pre20200507.ebuild
index fdbd50e..727ea74 100644
--- a/media-video/onvifviewer/onvifviewer-0.12-r2.ebuild
+++ b/www-misc/onvifviewer/onvifviewer-0.13_pre20200507.ebuild
@@ -6,17 +6,19 @@ inherit cmake-utils
 
 DESCRIPTION="Viewer for IP cameras ONVIF"
 HOMEPAGE="https://gitlab.com/caspermeijn/onvifviewer/"
-SRC_URI="https://gitlab.com/caspermeijn/onvifviewer/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+COMMITHASH=c0ac7f6bb62333dedf1fb59c0d7c9351dfc1e0b1
+SRC_URI="https://gitlab.com/caspermeijn/onvifviewer/-/archive/${COMMITHASH}/${PN}-${COMMITHASH}.tar.gz"
 RESTRICT="primaryuri"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="kde-frameworks/extra-cmake-modules:5
 	kde-frameworks/kirigami:5
-	net-libs/kdsoap:5
+	>=net-libs/kdsoap-1.8.50
+	net-libs/kdsoap-ws-discovery-client
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
@@ -34,7 +36,7 @@ DEPEND="kde-frameworks/extra-cmake-modules:5
 	kde-frameworks/kxmlgui:5"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-v${PV}"
+S="${WORKDIR}/${PN}-${COMMITHASH}"
 
 pkg_postinst()
 {