diff --git a/sys-apps/openwsman/Manifest b/sys-apps/openwsman/Manifest
index e659430..988a207 100644
--- a/sys-apps/openwsman/Manifest
+++ b/sys-apps/openwsman/Manifest
@@ -1,4 +1,4 @@
 AUX openwsmand.confd 2 SHA256 32c4858e22cc2c967b42150fa550562a2c839c2cebcaab91cabdf6f4da020022 SHA512 a80f7cc2606ef6e5474e96b1e520c17ecf432f0da9a566bd157044130cfb548f10d929ffb5783008df78b6d07d07d109bffbad1998cb8309eccec7e4d3fc813a WHIRLPOOL 4e420447645cae95d2cf774c31f643bdc2f98ed3f5b26aaf8bdf385b9221cf5ad59ac5352fd534560cafe5b247313b275e2f26cd3759acc98e28803e0901a51d
-AUX openwsmand.initd 263 SHA256 b02732a77d7be3723d3b256adb43ebf7d6d51bf3d456979a4fc51ddcced7753a SHA512 15e6ebed37c9dfcdd393d8bc258e1feeed7de7b90318a0524e17ca62ddb44b8a395b62130f0036e42ea5ba689b77a2ec9079e5aecba002f8834311be4617ef32 WHIRLPOOL 7736733f57205a9b7cc2c8de4e29d2fae2eae0276c28c313020f2f93541f6c2d2961ac44091a529c4d0dc340ce4d9cb62217121bb1b90cc4892db513638af2ab
-DIST openwsman-2.3.6.tar.bz2 381951 SHA256 3b5efa04080881428e57b8eafdeaec48b96f58f7dd5b92e93e7806f2026decc9 SHA512 39986298b49ff236a3e17a39bb78dccbdfa1c42bc911026ae6bfd307df837dfaec6765b03662ec4ef049a07e33072592699ab1eb808692643f9fc46212c4ad08 WHIRLPOOL fcac9abdf2ec915dd3871d0de6d85eab5b7bbfd87d04770f9240045b92c240d838ec30aa61537381b055aa17570e75bcccd9322ff57f805c4aa6feaca87842e4
-EBUILD openwsman-2.3.6.ebuild 2154 SHA256 5c4af90ebed41f3d8614522398888eb21cffbf22509a691fa7604f325763b6f1 SHA512 808ea5e37a00ee60c6794f3a7186311bced435f80e684fc449c244282bca203489d2d441b1817aa2673694ff9330662d1350d9294bebb85ecd7c1dc9408ba3d2 WHIRLPOOL 7763b758b3987bccf6b2720a5bfe42fd204db0bf698770f8c6fc2d32573f27265bc7c7754390b69a1df4a3c701525cbfa2c09210b7b359455a58c8185ffb861b
+AUX openwsmand.initd 263 SHA256 75f25591b641ee9ce59a12814cf2ab82d8c37a46022316500e6113a45bcf3776 SHA512 bd20fc3815d02b0dd5a2c2336b5204550ef941e362f686ddb00f7f96d93bd2222dd4cb076f39efe2e85d3262356c548d0c9d7c1d566a04bba2c4a942126851d2 WHIRLPOOL 1503156644a04d991552936b28efabf287c406c831a41034f9dd7751e5f224dcbded1ea26528bc5c70b5ec132dfc12e9049bb51ecea97bed4f1fcd62f4c369d5
+DIST openwsman-2.3.6.tar.gz 506564 SHA256 c9d846e029c477bbc8c34cef8f30e2216258021fd9277a1b588db67efdc204ad SHA512 cb29baa68bbc0e5cce1b09e14535a4dd02d53cf9f46c3b29738412ab35881efda0fde8e616ae3f8920d08a384f5717fb2495f3bc10339401128ac61c63f55dae WHIRLPOOL 8d9e9d0e44238f044672058ee0f5c9a38ab774304483d2bf6c957764feb6c598c1b44340bde34042b15b56fff25a8b5c42bacd053d30e3336b410d2c7069fa21
+EBUILD openwsman-2.3.6.ebuild 2540 SHA256 1d180a0012aea90cfc2936987b407fb63a4721b7f50cb107a118678407550c84 SHA512 8873c273b14b9b53f6ea2d647f261e91e4a33d45876c2399647ef5c8da7c17354c958788729dd6b36eb3d682b31fc31340fd14a57dcc68511e84b967de9f96af WHIRLPOOL b27b60dcf1cd71ae3cc77f3062abd217027406281f3f78b3f8641330e9957d18f13c1335001b2c534ada5b8bdd8a8db23fe13ed8a67c25a3c92121412e9467a1
diff --git a/sys-apps/openwsman/files/openwsmand.initd b/sys-apps/openwsman/files/openwsmand.initd
index cc8d1be..f7f0d57 100644
--- a/sys-apps/openwsman/files/openwsmand.initd
+++ b/sys-apps/openwsman/files/openwsmand.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/sys-apps/openwsman/openwsman-2.3.6.ebuild b/sys-apps/openwsman/openwsman-2.3.6.ebuild
index 0491326..156461c 100644
--- a/sys-apps/openwsman/openwsman-2.3.6.ebuild
+++ b/sys-apps/openwsman/openwsman-2.3.6.ebuild
@@ -1,69 +1,82 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
+EAPI=6
 
-PYTHON_DEPEND="python? 2:2.7"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+PYTHON_COMPAT=( python2_7 )
 
-inherit python cmake-utils ssl-cert java-pkg-2 java-utils-2
+inherit python-single-r1 cmake-utils ssl-cert java-pkg-opt-2
 
 DESCRIPTION="Opensource Implementation of WS-Management Client"
-HOMEPAGE="http://sourceforge.net/projects/openwsman"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/Openwsman"
+SRC_URI="https://github.com/Openwsman/openwsman/archive/v2.6.3.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+cim debug examples +eventing ipv6 java mono pam perl python plugins ruby ssl
-+server test"
 
+BINDINGS_USE="java perl python ruby"
+IUSE="+cim debug examples +eventing ipv6 pam +plugins ssl +server test ${BINDINGS_USE}"
+REQUIRED_USE="
+	java? ( plugins )
+	perl? ( plugins )
+	python? ( plugins )
+	ruby? ( plugins )
+"
+
+JAVA_PKG_NV_DEPEND="virtual/jdk:1.8"
 RDEPEND="
 	cim? ( dev-libs/sblim-sfcc )
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0 )
 	pam? ( virtual/pam )
-	ruby? ( <dev-lang/ruby-2 )
+	ruby? ( dev-lang/ruby:= )
 	perl? ( dev-lang/perl )
-	java? ( virtual/jdk )
-	plugins? ( dev-lang/swig )
+	java? ( ${JAVA_PKG_NV_DEPEND} )
+	python? ( ${PYTHON_DEPS} )
 	net-misc/curl[idn]
 	dev-libs/libxml2[icu]
 	"
 DEPEND="
 	${RDEPEND}
 	test? ( dev-util/cunit )
+	java? ( dev-lang/swig:0 )
+	perl? ( dev-lang/swig:0 )
+	python? ( dev-lang/swig:0 )
+	ruby? ( dev-lang/swig:0 )
 	"
 
 # LIBC != glibc build fail - add block
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
 src_prepare(){
 	#Ruby gem builder does not like Unicode
-	sed -e 's/Kämpf/Kaempf/' -i bindings/ruby/openwsman.gemspec.in
+	sed -e 's/Kämpf/Kaempf/' -i bindings/ruby/openwsman.gemspec.in
+	default
 }
 
 src_configure() {
+	local bindings=NO
+	for f in $BINDINGS_USE; do
+		use $f && bindings=YES
+	done
 	local mycmakeargs=(
 		-DPACKAGE_ARCHITECTURE=${ARCH}
-		$(cmake-utils_use_build cim LIBCIM)
-		$(cmake-utils_use_build examples)
-		$(cmake-utils_use_build python)
-		$(cmake-utils_use_build ruby)
-		$(cmake-utils_use_build perl)
-		$(cmake-utils_use_build java)
-		$(cmake-utils_use_build mono CSHARP)
-		$(cmake-utils_use_disable plugins)
-		$(cmake-utils_use_disable server)
-		$(cmake-utils_use_enable eventing)
-		$(cmake-utils_use_enable ipv6)
-		$(cmake-utils_use_use pam)
+		-DBUILD_BINDINGS=${bindings}
+		-DBUILD_CUNIT_TESTS=$(usex test)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_JAVA=$(usex java)
+		-DBUILD_LIBCIM=$(usex cim)
+		-DBUILD_PERL=$(usex perl)
+		-DBUILD_PYTHON=$(usex python)
+		-DBUILD_RUBY=$(usex ruby)
+		-DBUILD_SWIG_PLUGIN=${bindings}
+		-DBUILD_TESTS=$(usex test)
+		-DDISABLE_PLUGINS="$(usex plugins)
+		-DDISABLE_SERVER="$(usex server)
+		-DENABLE_EVENTING_SUPPORT="$(usex eventing)
+		-DWSMAN_DEBUG_VERBOSE="$(usex debug)
+		-DENABLE_IPV6="$(usex ipv6)
+		-DUSE_PAM="$(usex pam)
 	)
+	use ruby && mycmakeargs+=( -DBUILD_RUBY_GEM=YES )
 	cmake-utils_src_configure
 }
 
diff --git a/sys-apps/wsmancli/Manifest b/sys-apps/wsmancli/Manifest
index ee143e7..cb28714 100644
--- a/sys-apps/wsmancli/Manifest
+++ b/sys-apps/wsmancli/Manifest
@@ -1,2 +1,2 @@
 DIST wsmancli-2.3.0.tar.bz2 290945 SHA256 b89d44d67b80125561611d41fdbf57e46d2bafe2b954b79df4b85090073900b2 SHA512 d3c2368ece160ed51b99bf373b33b07c38a8fa521d8ab81208c4adb64e8c501e461a11625598799e23407f8b01025b50b0a21df9b8a0e0ac346f69cfcbd3cd8f WHIRLPOOL 72eadba23556771f61dba28e0552a116563f47dbefd5766efdd6c8114d297d59c20bba5f45eacc1e37ca649f8a0e07193e312b9eeb20520405717a71418ffb3b
-EBUILD wsmancli-2.3.0.ebuild 734 SHA256 abe52283664af3dc0003ae4d1c3ae6bc8cdf34238f80c95774ce60beea1a32f3 SHA512 7bcd78483cf4366583837e4319f8d5ff4583a0d4f660861f45aa1876a59c7baf7337ae78c18f019da8f52ac47e5d6640d41274f29212f8e003d583a416abb959 WHIRLPOOL db9d792ff263b449bcc5740f35491a05438487778ac4a97e35c4a9b068dea9ad114b0721fbd75716e7c1635af826744f4961f5e45a8e09fddfe1b389dca152f3
+EBUILD wsmancli-2.3.0.ebuild 721 SHA256 1f639076f8a76bde6cfb7bbcb01674ea77d3a0d9b7659fa065ac04d672ab3bbb SHA512 f8d549e9a19d0c7c6f9b51d95ec5b693da7012c5fa48b585037baf5fe2ffe346eddb4e3e7467543e2968c43744166f8d0d9d6fcd66ef5120822d134a17842d9e WHIRLPOOL 5858f02c5a77560f8978f13603a2bf613aec44d805b4d0573bb3766b2350396889a151130a10e4cf44baa80620d88cb90df5b53b1b5bd091b03806eddcc7cedd
diff --git a/sys-apps/wsmancli/wsmancli-2.3.0.ebuild b/sys-apps/wsmancli/wsmancli-2.3.0.ebuild
index 9f85e25..3592ce4 100644
--- a/sys-apps/wsmancli/wsmancli-2.3.0.ebuild
+++ b/sys-apps/wsmancli/wsmancli-2.3.0.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 EAPI=4