diff --git a/srcpkgs/javahelp2/patches/fix-build_xml.patch b/srcpkgs/javahelp2/patches/fix-build_xml.patch
deleted file mode 100644
index 98e790a26ae..00000000000
--- a/srcpkgs/javahelp2/patches/fix-build_xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- javahelp_nbproject/build.xml	2009-11-23 13:51:06.000000000 +0100
-+++ javahelp_nbproject/build.xml	2015-12-02 18:22:39.236728900 +0100
-@@ -45,7 +45,7 @@
-     <available property="jdic-zip-present" file="${jdic-zip}"/>
-     
-     <target name="-pre-init" 
--        depends="unpack-servlet-jar,unpack-jsp-jar,unpack-jdic-jar"/>
-+        depends="unpack-servlet-jar,unpack-jsp-jar"/>
-         
-     <target name="release" description="Build the full JavaHelp JARs" 
-             depends="build-jsearch-jars,copy-jsearch-jars,create-javahelp-jars"/>
diff --git a/srcpkgs/javahelp2/template b/srcpkgs/javahelp2/template
index 3fb211e16a1..9393ebd8b04 100644
--- a/srcpkgs/javahelp2/template
+++ b/srcpkgs/javahelp2/template
@@ -1,17 +1,17 @@
 # Template file for 'javahelp2'
 pkgname=javahelp2
-version=2.0.05
+version=2.0.05.20170719
 revision=1
-_svnver=svn63
-wrksrc=${pkgname}-${version}_${_svnver}
+_gitver=3ca862d8626096770598a3a256886d205246f4a4
+wrksrc=javahelp-${_gitver}
 noarch=yes
 short_desc="Java based help system"
 hostmakedepends="openjdk apache-ant unzip"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-3"
+license="CDDL-1.1, GPL-2.0-only"
 homepage="https://javahelp.java.net/"
-distfiles="http://ftp.mirrorservice.org/sites/distfiles.gentoo.org/distfiles/${pkgname}-src-${version}_${_svnver}.zip"
-checksum=a864ac71701ed8d12ba192460cd7b4d51e78813f39a140ede5d9b04afd9eae92
+distfiles="https://github.com/javaee/javahelp/archive/${_gitver}.zip>${pkgname}-${version}.zip"
+checksum=eaeea34c0bf58d3c67ff388ae7543a950c2af1cfba6edba9e9fa77d61b58c481
 
 do_install() {
 	local _javahelp=usr/share/java/javahelp
@@ -34,4 +34,5 @@ do_install() {
 	for f in dist/lib/*.jar; do
 		vinstall $f 644 ${_javahelp}
 	done
+	vlicense ${wrksrc}/LICENSE
 }