diff --git a/www/hotjava/Makefile b/www/hotjava/Makefile
index 97f098d1beb..29091952d5c 100644
--- a/www/hotjava/Makefile
+++ b/www/hotjava/Makefile
@@ -1,34 +1,36 @@
-# $OpenBSD: Makefile,v 1.6 2000/06/16 23:06:16 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2000/09/12 12:00:59 espie Exp $
 
 #
 # From:
 # $FreeBSD: ports/www/hotjava/Makefile,v 1.4 2000/02/16 00:19:45 mharo Exp $
 #
 
-DISTNAME=	hjb3_0-linux.sfx
-PKGNAME=	hotjava-3.0
+DISTNAME=	hotjava-3.0
 CATEGORIES=	www
-FAKE=No
+NEED_VERSION=	1.327
 MASTER_SITES=
-EXTRACT_SUFX=
+DISTFILES=	hjb3_0-linux.sfx
+
+EXTRACT_CASES=*.sfx) uudecode ${FULLDISTDIR}/$$archive;;
 
 MAINTAINER=	chris@OpenBSD.org
 
-RUN_DEPENDS=	${PREFIX}/jdk${JDK_VERSION}/bin/java::devel/jdk
+JDK=	jdk1.1.8
+JAR=	${JDK}/bin/jar
+JAVA=	${JDK}/bin/java
 
-LICENSE_TYPE=		NOFEE
+BUILD_DEPENDS=	${PREFIX}/${JAR}::devel/jdk
+RUN_DEPENDS=	${PREFIX}/${JAVA}::devel/jdk
+
+# No Fee
 PERMIT_PACKAGE_CDROM=	No
 PERMIT_PACKAGE_FTP=	No
 PERMIT_DISTFILES_CDROM=	No
 PERMIT_DISTFILES_FTP=	No
 MIRROR_DISTFILE=	No
 
-EXTRACT_ONLY=
-
-WRKSRC=		${WRKDIR}
-JDK_VERSION=    1.1.8
-NO_BUILD=	Yes
-NO_PACKAGE=	Yes
+WRKDIST=		${WRKDIR}
+NO_BUILD=		Yes
 
 HOMEPAGE= http://java.sun.com/products/hotjava/
 
@@ -47,12 +49,16 @@ do-fetch:
 	   exit 1 ; \
 	fi
 
-pre-install:
-	@sed -e s,/usr/bin/hotjava,${PREFIX}/bin/hotjava,g ${DISTDIR}/${DISTNAME} > ${WRKDIR}/${DISTNAME}
-	@${INSTALL_DATA_DIR} ${PREFIX}/share
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/java
-
 do-install:
-	@sh ${WRKDIR}/${DISTNAME} ${PREFIX}/jdk${JDK_VERSION} ${PREFIX}/share/java
+	${INSTALL_DATA_DIR} ${PREFIX}/share/java/HotJava
+	cd ${PREFIX}/share/java/HotJava && \
+		${TRUEPREFIX}/${JAR} xf ${WRKDIST}/hjb3_0.jar
+	cd ${PREFIX}/share/java/HotJava && chmod -R a+rX *
+	echo '#! /bin/sh' >${PREFIX}/bin/hotjava
+	echo 'exec ${TRUEPREFIX}/${JAVA} -classpath \
+	${TRUEPREFIX}/${JDK}/lib/classes.zip:${TRUEPREFIX}/share/java/HotJava/Browser.jar \
+	sunw.hotjava.Main -Dhotjava.home=${TRUEPREFIX}/share/java/HotJava' \
+		>>${PREFIX}/bin/hotjava
+	chmod a+rx ${PREFIX}/bin/hotjava
 
 .include <bsd.port.mk>
diff --git a/www/hotjava/patches/patch-aa b/www/hotjava/patches/patch-aa
deleted file mode 100644
index c2ad708c351..00000000000
--- a/www/hotjava/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- hjb3_0-linux.sfx.orig	Sun Jul  4 16:35:25 1999
-+++ hjb3_0-linux.sfx	Sun Jul  4 16:35:33 1999
-@@ -24,7 +24,7 @@
- 	destDir=${2}/HotJava
- fi
- 
--mkdir $destDir
-+mkdir -p $destDir
- mv README license.html Browser.jar $destDir
- cp -rf admin-docs $destDir
- echo "${1}/bin/java -classpath ${1}/lib/classes.zip:${destDir}/Browser.jar sunw.hotjava.Main -Dhotjava.home=${destDir} &" > ${destDir}/hotjava
diff --git a/www/hotjava/pkg/DESCR b/www/hotjava/pkg/DESCR
index 8d231ece5b2..4ff4a182d84 100644
--- a/www/hotjava/pkg/DESCR
+++ b/www/hotjava/pkg/DESCR
@@ -1,7 +1,7 @@
 The latest version of Sun's Hotjava web browser.  See the Hotjava web pages
 at:
 
-WWW: http://java.sun.com/products/hotjava/
+WWW: ${HOMEPAGE}
 
 for more details.
 
diff --git a/www/hotjava/pkg/PLIST b/www/hotjava/pkg/PLIST
index 87fc5686e21..fbc17775fe1 100644
--- a/www/hotjava/pkg/PLIST
+++ b/www/hotjava/pkg/PLIST
@@ -11,7 +11,6 @@ share/java/HotJava/admin-docs/index.html
 share/java/HotJava/admin-docs/admin.properties.txt
 share/java/HotJava/admin-docs/banner.gif
 share/java/HotJava/admin-docs/trustProxy.html
-share/java/HotJava/hotjava
 @dirrm share/java/HotJava/admin-docs
 @dirrm share/java/HotJava
 @unexec rmdir %D/share/java || true