diff --git a/www/jserv/Makefile b/www/jserv/Makefile
index 0c2600bbee4..bb10a8b9915 100644
--- a/www/jserv/Makefile
+++ b/www/jserv/Makefile
@@ -1,22 +1,22 @@
-# $OpenBSD: Makefile,v 1.3 2001/11/10 15:00:52 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2001/11/20 10:30:17 reinhard Exp $
 
 # Build just the Tomcat connector for our in-tree Apache
 COMMENT=	"Tomcat (Servlet/JSP) - Apache Connector"
 
-VER=		3.2.2
-PKGNAME=	jserv-${VER}
-DISTNAME=	jakarta-tomcat-${VER}-src
+V=		3.2.3
+PKGNAME=	jserv-${V}
+DISTNAME=	jakarta-tomcat-${V}-src
 CATEGORIES=	www
-NEED_VERSION=	1.489
-MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.2/src/
+NEED_VERSION=	1.499
+MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v${V}/src/
+EXTRACT_SUFX=	.zip
 
 HOMEPAGE=	http://jakarta.apache.org/
 
 MAINTAINER=	Reinhard J. Sammer <reinhard@openbsd.org>
 
-# XXX: USE_JAVA=TBD
-JAVA_HOME=	${LOCALBASE}/jdk1.2-blackdown
-BUILD_DEPENDS=	::devel/jdk/1.2-blackdown 
+JDK_VERSION=	1.2-blackdown
+JAVA_HOME=	${LOCALBASE}/jdk${JDK_VERSION}
 RUN_DEPENDS=	::www/jakarta-tomcat
 
 # Apache Software License
@@ -25,6 +25,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+NO_REGRESS=	Yes
+
 do-build:
 	cd ${WRKSRC}/src/native/apache/jserv && /usr/sbin/apxs -c *.c -o mod_jserv.so
 
diff --git a/www/jserv/distinfo b/www/jserv/distinfo
new file mode 100644
index 00000000000..db2f87f2423
--- /dev/null
+++ b/www/jserv/distinfo
@@ -0,0 +1,3 @@
+MD5 (jakarta-tomcat-3.2.3-src.zip) = f833a208a73f06c4f8127bbe3e754501
+RMD160 (jakarta-tomcat-3.2.3-src.zip) = 96052e9bde3c3f317e4126af713df8e3216d836d
+SHA1 (jakarta-tomcat-3.2.3-src.zip) = 1b766768dfd649d23d92090845127d89d121d7fa
diff --git a/www/jserv/files/md5 b/www/jserv/files/md5
deleted file mode 100644
index 88d05988fe2..00000000000
--- a/www/jserv/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (jakarta-tomcat-3.2.2-src.tar.gz) = c7d39a2b7d3b1bf0ba14591891d4b6d0
-RMD160 (jakarta-tomcat-3.2.2-src.tar.gz) = f98685cbbecb84803559efe146d3e77e7789407c
-SHA1 (jakarta-tomcat-3.2.2-src.tar.gz) = 948aa92250c6b00013e6d6bb49bce62d8bc54be8