diff --git a/dev-cpp/open-zwave/Manifest b/dev-cpp/open-zwave/Manifest
index a56357e..f983514 100644
--- a/dev-cpp/open-zwave/Manifest
+++ b/dev-cpp/open-zwave/Manifest
@@ -1 +1 @@
-DIST V1.5.tar.gz 962906 SHA256 abfb4c7e7728e86ba374c2e0ef7de912594eb24a8c44935457352df844530238 SHA512 3516bd27319a63f68079d8c3b808d3d79a67708b80dbd621e0fe8a6a944f1878731ebd4be147ef7122bcd7caec58bb5e8a95ce8258cfa6ab144c6ff06df149c3 WHIRLPOOL 64c3bc0b1b5be78a3ad41faf313564bddaef04bda8d5c08781e2210f2f4e72b9467c3b5fbd62d741ea3a1eafdbe5645859d5ce03bdbf05c027733dccabce5edc
+DIST V1.5.tar.gz 962906 BLAKE2B 3a0950dd94f22c404f68412ecc8610ae9c334271b16a66be73839c8577f86fb28fc9c4aa059566b4825978b84c44bdb55412894b170653e38619e4a9d09bfd13 SHA512 3516bd27319a63f68079d8c3b808d3d79a67708b80dbd621e0fe8a6a944f1878731ebd4be147ef7122bcd7caec58bb5e8a95ce8258cfa6ab144c6ff06df149c3
diff --git a/dev-cpp/open-zwave/open-zwave-1.5.ebuild b/dev-cpp/open-zwave/open-zwave-1.5.ebuild
index 22f9eb2..c6d5520 100644
--- a/dev-cpp/open-zwave/open-zwave-1.5.ebuild
+++ b/dev-cpp/open-zwave/open-zwave-1.5.ebuild
@@ -1,11 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="a C++ library to control Z-Wave Networks via a USB Z-Wave Controller"
 HOMEPAGE="http://www.openzwave.net/"
-SRC_URI="https://github.com/OpenZWave/${PN}/archive/V${PV}.tar.gz"
+
+EGIT_REPO_URI="https://github.com/OpenZWave/open-zwave.git"
+
+if [[ "$PV" == "9999" ]] ; then
+	inherit git-r3
+elif [[ "$PV" == "1.5_p20190124" ]] ; then
+	inherit git-r3
+	EGIT_COMMIT="791287063cddf9c30634ff924e56b654de77050a"
+else
+	SRC_URI="https://github.com/OpenZWave/${PN}/archive/V${PV}.tar.gz"
+fi
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -14,3 +24,24 @@ IUSE=""
 
 DEPEND="virtual/libudev"
 RDEPEND="${DEPEND}"
+
+src_prepare(){
+	eapply_user
+	sed -i -e "s/\$(PREFIX)\/etc\/openzwave/\/etc\/openzwave/" cpp/build/support.mk
+}
+
+src_install(){
+	emake DESTDIR="${D}" PREFIX="/usr/" install
+
+	if ! declare -p DOCS >/dev/null 2>&1 ; then
+		local d
+		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
+				FAQ CREDITS CHANGELOG ; do
+			[[ -s "${d}" ]] && dodoc "${d}"
+		done
+	elif declare -p DOCS | grep -q "^declare -a " ; then
+		dodoc "${DOCS[@]}"
+	else
+		dodoc ${DOCS}
+	fi
+}
diff --git a/dev-cpp/open-zwave/open-zwave-1.5_p20190124.ebuild b/dev-cpp/open-zwave/open-zwave-1.5_p20190124.ebuild
new file mode 100644
index 0000000..c6d5520
--- /dev/null
+++ b/dev-cpp/open-zwave/open-zwave-1.5_p20190124.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="a C++ library to control Z-Wave Networks via a USB Z-Wave Controller"
+HOMEPAGE="http://www.openzwave.net/"
+
+EGIT_REPO_URI="https://github.com/OpenZWave/open-zwave.git"
+
+if [[ "$PV" == "9999" ]] ; then
+	inherit git-r3
+elif [[ "$PV" == "1.5_p20190124" ]] ; then
+	inherit git-r3
+	EGIT_COMMIT="791287063cddf9c30634ff924e56b654de77050a"
+else
+	SRC_URI="https://github.com/OpenZWave/${PN}/archive/V${PV}.tar.gz"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/libudev"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	eapply_user
+	sed -i -e "s/\$(PREFIX)\/etc\/openzwave/\/etc\/openzwave/" cpp/build/support.mk
+}
+
+src_install(){
+	emake DESTDIR="${D}" PREFIX="/usr/" install
+
+	if ! declare -p DOCS >/dev/null 2>&1 ; then
+		local d
+		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
+				FAQ CREDITS CHANGELOG ; do
+			[[ -s "${d}" ]] && dodoc "${d}"
+		done
+	elif declare -p DOCS | grep -q "^declare -a " ; then
+		dodoc "${DOCS[@]}"
+	else
+		dodoc ${DOCS}
+	fi
+}
diff --git a/dev-cpp/open-zwave/open-zwave-9999.ebuild b/dev-cpp/open-zwave/open-zwave-9999.ebuild
new file mode 100644
index 0000000..c6d5520
--- /dev/null
+++ b/dev-cpp/open-zwave/open-zwave-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="a C++ library to control Z-Wave Networks via a USB Z-Wave Controller"
+HOMEPAGE="http://www.openzwave.net/"
+
+EGIT_REPO_URI="https://github.com/OpenZWave/open-zwave.git"
+
+if [[ "$PV" == "9999" ]] ; then
+	inherit git-r3
+elif [[ "$PV" == "1.5_p20190124" ]] ; then
+	inherit git-r3
+	EGIT_COMMIT="791287063cddf9c30634ff924e56b654de77050a"
+else
+	SRC_URI="https://github.com/OpenZWave/${PN}/archive/V${PV}.tar.gz"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/libudev"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	eapply_user
+	sed -i -e "s/\$(PREFIX)\/etc\/openzwave/\/etc\/openzwave/" cpp/build/support.mk
+}
+
+src_install(){
+	emake DESTDIR="${D}" PREFIX="/usr/" install
+
+	if ! declare -p DOCS >/dev/null 2>&1 ; then
+		local d
+		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
+				FAQ CREDITS CHANGELOG ; do
+			[[ -s "${d}" ]] && dodoc "${d}"
+		done
+	elif declare -p DOCS | grep -q "^declare -a " ; then
+		dodoc "${DOCS[@]}"
+	else
+		dodoc ${DOCS}
+	fi
+}