diff --git a/lang/helium/Makefile b/lang/helium/Makefile
index 1778ee0851b5..bb803e25098c 100644
--- a/lang/helium/Makefile
+++ b/lang/helium/Makefile
@@ -15,6 +15,16 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	obraun@FreeBSD.org
 COMMENT=	Functional programming compiler for a subset of Haskell
 
+.if defined(WITH_HINT)
+USE_JAVA=	1.4+
+DISTFILES+=	${PORTNAME}-${PORTVERSION}-src.tar.gz \
+		Hint.jar
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-src.tar.gz
+PLIST_SUB=	HINT=""
+.else
+PLIST_SUB=	HINT="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 500035
 BROKEN=	does not compile
@@ -26,6 +36,13 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
+.if !defined(WITH_HINT)
+pre-everything::
+	@${ECHO_CMD}
+	@${ECHO_CMD} "Define WITH_HINT=yes to install Hint (needs Java >=1.4)."
+	@${ECHO_CMD}
+.endif
+
 do-configure:
 	@(cd ${WRKSRC}/lvm/src/  && ./configure)
 	@(cd ${WRKSRC}/heliumNT/ && ./configure)
@@ -37,5 +54,14 @@ do-build:
 do-install:
 	@(cd ${WRKSRC}/heliumNT/src && ${GMAKE} install)
 	@${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g'
+.if defined(WITH_HINT)
+	@${MKDIR} ${PREFIX}/share/java/helium
+	@${INSTALL_DATA} ${DISTDIR}/Hint.jar ${PREFIX}/share/java/helium
+	@${ECHO_CMD} "To use Hint type"
+	@${ECHO_CMD}
+	@${ECHO_CMD} "java -DLVMPATH=\$$LVMPATH -jar ${PREFIX}/share/java/helium/Hint.jar"
+	@${ECHO_CMD}
+.endif
+
 
 .include <bsd.port.post.mk>
diff --git a/lang/helium/distinfo b/lang/helium/distinfo
index 0352683b8322..f8366b61d17b 100644
--- a/lang/helium/distinfo
+++ b/lang/helium/distinfo
@@ -1 +1,2 @@
 MD5 (helium-1.1-src.tar.gz) = 1c33240ce2d286c8225246d87c353f40
+MD5 (Hint.jar) = d9caae2afdbd60a4a1f58174d318464a
diff --git a/lang/helium/pkg-plist b/lang/helium/pkg-plist
index cfa49b922e03..f81feafcbf51 100644
--- a/lang/helium/pkg-plist
+++ b/lang/helium/pkg-plist
@@ -16,6 +16,8 @@ helium/lib/Maybe.lvm
 helium/lib/Prelude.hs
 helium/lib/Prelude.lvm
 helium/lib/PreludePrim.lvm
+%%HINT%%share/java/helium/Hint.jar
+%%HINT%%@dirrm share/java/helium
 @dirrm helium/demo
 @dirrm helium/lib
 @dirrm helium