diff --git a/srcpkgs/javahelp2/patches/fix-build_xml.patch b/srcpkgs/javahelp2/patches/fix-build_xml.patch
new file mode 100644
index 00000000000..98e790a26ae
--- /dev/null
+++ b/srcpkgs/javahelp2/patches/fix-build_xml.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 00000000000..3fb211e16a1
--- /dev/null
+++ b/srcpkgs/javahelp2/template
@@ -0,0 +1,37 @@
+# Template file for 'javahelp2'
+pkgname=javahelp2
+version=2.0.05
+revision=1
+_svnver=svn63
+wrksrc=${pkgname}-${version}_${_svnver}
+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"
+homepage="https://javahelp.java.net/"
+distfiles="http://ftp.mirrorservice.org/sites/distfiles.gentoo.org/distfiles/${pkgname}-src-${version}_${_svnver}.zip"
+checksum=a864ac71701ed8d12ba192460cd7b4d51e78813f39a140ede5d9b04afd9eae92
+
+do_install() {
+	local _javahelp=usr/share/java/javahelp
+
+	# Remove class uncompilable without JDIC
+	rm -v jhMaster/JavaHelp/src/new/javax/help/plaf/basic/BasicNativeContentViewerUI.java
+
+	# Build jars
+	cd javahelp_nbproject
+	ant release
+
+	vmkdir usr/bin
+
+	for f in jhindexer jhsearch; do
+		vinstall dist/bin/${f}.jar 644 ${_javahelp}
+		sed dist/bin/${f} -e "s;opt/javahelp;${_javahelp};g" > ${f}
+		vbin ${f}
+	done
+
+	for f in dist/lib/*.jar; do
+		vinstall $f 644 ${_javahelp}
+	done
+}