diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index 4e0e38604e8..6785e3cb018 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2005/01/26 02:31:14 alek Exp $
+# $OpenBSD: Makefile,v 1.5 2005/03/05 01:04:11 kurt Exp $
 
 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
@@ -6,14 +6,14 @@ NOT_FOR_ARCHS=		${NO_SHARED_ARCHS}
 
 COMMENT=		"Apache-Tomcat AJP Connector"
 
-V=			1.2.6
-DISTNAME=		jakarta-tomcat-connectors-jk-${V}-src
-PKGNAME=		mod_jk-${V}p0
+V=			1.2.8
+DISTNAME=		jakarta-tomcat-connectors-${V}-src
+PKGNAME=		mod_jk-${V}
 CATEGORIES=		www
 
 HOMEPAGE=		http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/
 
-MAINTAINER=		Kurt Miller <truk@apache.org>
+MAINTAINER=		Kurt Miller <kurt@openbsd.org>
 
 # Apache Software License 2.0
 PERMIT_PACKAGE_CDROM=	Yes
@@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		${MASTER_SITE_APACHE:=jakarta/tomcat-connectors/jk/source/}
+MASTER_SITES=		${MASTER_SITE_APACHE:=jakarta/tomcat-connectors/jk/source/jk-$V/}
 
 SEPARATE_BUILD=		concurrent
 NO_REGRESS=		Yes
@@ -34,7 +34,7 @@ CONFIGURE_ENV+=		CFLAGS='${CFLAGS} -DCHROOTED_APACHE'
 WRKSRC=			${WRKDIR}/${DISTNAME}/jk/native
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/scripts/build/unix
 
-EXAMPLES=		mod_jk.conf workers.properties
+EXAMPLES=		workers.properties workers.properties.minimal
 DOCDIR=			${PREFIX}/share/doc/mod_jk
 SUBST_VARS=		DOCDIR
 
@@ -47,16 +47,15 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/mod_jk-enable ${PREFIX}/sbin/mod_jk-enable
 	${INSTALL_DATA} ${WRKBUILD}/apache-1.3/mod_jk.so.0.0 ${PREFIX}/lib/mod_jk.so
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mod_jk
+	${INSTALL_DATA} ${FILESDIR}/mod_jk.conf ${PREFIX}/share/examples/mod_jk
 .for file in ${EXAMPLES}
-	${INSTALL_DATA} ${FILESDIR}/${file} ${PREFIX}/share/examples/mod_jk
+	${INSTALL_DATA} ${WRKSRC}/../conf/${file} ${PREFIX}/share/examples/mod_jk
 .endfor
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	sed 's,/usr/local,${TRUEPREFIX},' \
 		< ${FILESDIR}/README.OpenBSD >${WRKSRC}/README.OpenBSD
 	${INSTALL_DATA} ${WRKSRC}/README.OpenBSD ${DOCDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/LICENSE ${DOCDIR}
-	cd ${WRKDIR}/${DISTNAME}/jk/docs && \
-	    find . -type d -exec ${INSTALL_DATA_DIR} ${DOCDIR}/{} \; && \
-	    find . -type f -exec ${INSTALL_DATA} {} ${DOCDIR}/{} \;
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/NOTICE ${DOCDIR}
 
 .include "bsd.port.mk"
diff --git a/www/mod_jk/distinfo b/www/mod_jk/distinfo
index 41a7e0fad55..3d4223ed04e 100644
--- a/www/mod_jk/distinfo
+++ b/www/mod_jk/distinfo
@@ -1,4 +1,4 @@
-MD5 (jakarta-tomcat-connectors-jk-1.2.6-src.tar.gz) = 018b91a0ce874cbc3dae7700f452838b
-RMD160 (jakarta-tomcat-connectors-jk-1.2.6-src.tar.gz) = d80aff2386aef46c330559664d4850a7c14e20ba
-SHA1 (jakarta-tomcat-connectors-jk-1.2.6-src.tar.gz) = a25a9b3a1bdc7f0263113bac3013e19f5a693f40
-SIZE (jakarta-tomcat-connectors-jk-1.2.6-src.tar.gz) = 849481
+MD5 (jakarta-tomcat-connectors-1.2.8-src.tar.gz) = eb579c47f8dd71e526d7561c919ce06d
+RMD160 (jakarta-tomcat-connectors-1.2.8-src.tar.gz) = a4d12a11094125f2d7c78a6c679dec43a454d6ad
+SHA1 (jakarta-tomcat-connectors-1.2.8-src.tar.gz) = 3add398066c667cc8cbce05bf277e06550cf7f35
+SIZE (jakarta-tomcat-connectors-1.2.8-src.tar.gz) = 798199
diff --git a/www/mod_jk/files/README.OpenBSD b/www/mod_jk/files/README.OpenBSD
index 02670774ead..48ea0b100e0 100644
--- a/www/mod_jk/files/README.OpenBSD
+++ b/www/mod_jk/files/README.OpenBSD
@@ -1,4 +1,4 @@
-$OpenBSD: README.OpenBSD,v 1.2 2004/10/12 20:53:06 naddy Exp $
+$OpenBSD: README.OpenBSD,v 1.3 2005/03/05 01:04:11 kurt Exp $
 
                           OpenBSD mod_jk Package
                        Apache-Tomcat AJP Connector
@@ -11,7 +11,7 @@ resides outsite of /var/www. All Apache DSO modules have this problem.
 
 mod_jk AJP13 Basic Setup:
 
-Steps 1-6 cover how to get mod_jk configured to work with a single Tomcat
+Steps 1-5 cover how to get mod_jk configured to work with a single Tomcat
 server (local or remote) where Tomcat serves both the static and dynamic
 content for the default installed Tomcat contexts. If this is your first time
 using mod_jk, start here and get this working first. This section assumes
@@ -19,35 +19,29 @@ that you have installed Tomcat and can access the examples context directly
 (i.e. http://your.tomcat.host:8080/examples/ for Tomcat 4 or 
 http://your.tomcat.host:8080/jsp-examples/ for Tomcat 5).
 
+Sample configuration files will be installed to /var/www/conf if you don't
+already have them.
+
 1) Enable the module by executing /usr/local/sbin/mod_jk-enable with root
 privileges (using sudo).
 
-2) Copy /usr/local/share/examples/mod_jk/workers.properties to 
-/var/www/conf/jk/workers.properties (create /var/www/conf/jk/ if necessary).
-If Tomcat is installed on another machine, edit and change the 
-`worker.ajp13.host' line to the hostname or IP address of the location of 
-Tomcat.
+2) If Tomcat is installed on another machine, edit the sample 
+/var/www/conf/workers.properies file and change the `worker.ajp13w.host'
+line to the hostname or IP address of the location of Tomcat.
 
-3) Copy /usr/local/share/examples/mod_jk/mod_jk.conf to
-/var/www/conf/jk/mod_jk.conf.
+3) Edit /var/www/conf/httpd.conf and add the following line at the end of
+the file to include the sample mod_jk.conf file:
 
-4) Edit /var/www/conf/httpd.conf and add the following line at the end of
-the file:
+   Include /var/www/conf/mod_jk.conf
 
-   Include /var/www/conf/jk/mod_jk.conf
+4) Stop and start Apache using apachectl(1)
 
-5) Stop and start Apache using apachectl(1)
+5) Test mod_jk by accessing the url http://your.apache.host/examples/ for 
+Tomcat 4 or http://your.apache.host/jsp-examples/ for Tomcat 5.
 
-6) Test mod_jk by accessing the url http://your.apache.host/examples/ for 
-Tomcat 4 or http://your.apache.host/jsp-examples/.
-
-mod_jk Resources:
-
-The mod_jk documentation is installed in /usr/local/share/doc/mod_jk. Example
-files for this README are located in /usr/local/share/examples/mod_jk.
 On-line documentation is here:
 
-http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/
+http://jakarta.apache.org/tomcat/connectors-doc/index.html
 
 The mailing list archives for tomcat-user can be found at:
 
diff --git a/www/mod_jk/files/mod_jk.conf b/www/mod_jk/files/mod_jk.conf
index 0394ab97fd8..ee6e57bdc91 100644
--- a/www/mod_jk/files/mod_jk.conf
+++ b/www/mod_jk/files/mod_jk.conf
@@ -1,22 +1,22 @@
-JkWorkersFile "/var/www/conf/jk/workers.properties"
+JkWorkersFile "/var/www/conf/workers.properties"
 JkLogFile "/var/www/logs/mod_jk.log"
 
 JkLogLevel error
 
 # Tomcat 4 urls
-JkMount /examples ajp13
-JkMount /examples/* ajp13
+JkMount /examples ajp13w
+JkMount /examples/* ajp13w
 
 # Tomcat 5 urls
-JkMount /jsp-examples ajp13
-JkMount /jsp-examples/* ajp13
+JkMount /jsp-examples ajp13w
+JkMount /jsp-examples/* ajp13w
 
-JkMount /servlets-examples ajp13
-JkMount /servlets-examples/* ajp13
+JkMount /servlets-examples ajp13w
+JkMount /servlets-examples/* ajp13w
 
 # Common Tomcat 4 & 5 urls
-JkMount /webdav ajp13
-JkMount /webdav/* ajp13
+JkMount /webdav ajp13w
+JkMount /webdav/* ajp13w
 
-JkMount /tomcat-docs ajp13
-JkMount /tomcat-docs/* ajp13
+JkMount /tomcat-docs ajp13w
+JkMount /tomcat-docs/* ajp13w
diff --git a/www/mod_jk/files/workers.properties b/www/mod_jk/files/workers.properties
deleted file mode 100644
index 5f85619cc54..00000000000
--- a/www/mod_jk/files/workers.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# BEGIN workers.properties
-#
-# Setup for apache system
-# 
-ps=/
-worker.list=ajp13
-
-# Definition for Ajp13 worker
-#
-# Change the worker.ajp13.host entry to the location of your
-# Tomcat server. 
-
-worker.ajp13.type=ajp13
-worker.ajp13.port=8009
-worker.ajp13.host=127.0.0.1
-
-#
-# END workers.properties
diff --git a/www/mod_jk/patches/patch-jk_conf_workers_properties_minimal b/www/mod_jk/patches/patch-jk_conf_workers_properties_minimal
new file mode 100644
index 00000000000..9c16406db61
--- /dev/null
+++ b/www/mod_jk/patches/patch-jk_conf_workers_properties_minimal
@@ -0,0 +1,10 @@
+$OpenBSD: patch-jk_conf_workers_properties_minimal,v 1.1 2005/03/05 01:04:11 kurt Exp $
+--- jk/conf/workers.properties.minimal.orig	Thu Mar  3 21:48:44 2005
++++ jk/conf/workers.properties.minimal	Thu Mar  3 21:49:11 2005
+@@ -13,5 +13,5 @@ worker.list=ajp13w
+ # Note that the name and the type do not have to match.
+ #
+ worker.ajp13w.type=ajp13
+-worker.ajp13w.host=localhost
++worker.ajp13w.host=127.0.0.1
+ worker.ajp13w.port=8009
diff --git a/www/mod_jk/patches/patch-jk_native_apache-1_3_Makefile_in b/www/mod_jk/patches/patch-jk_native_apache-1_3_Makefile_in
deleted file mode 100644
index d4c03934259..00000000000
--- a/www/mod_jk/patches/patch-jk_native_apache-1_3_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-jk_native_apache-1_3_Makefile_in,v 1.1 2004/10/12 20:53:06 naddy Exp $
---- jk/native/apache-1.3/Makefile.in.orig	Thu Jul 22 12:30:39 2004
-+++ jk/native/apache-1.3/Makefile.in	Thu Jul 22 12:31:48 2004
-@@ -24,7 +24,7 @@ BUILD_DIR = ${JK_DIR}/../build/jk/apache
- APACHE_FILES = Makefile.tmpl Makefile.libdir libjk.module
- 
- JK=../common/
--JK_INCL=-DUSE_APACHE_MD5 -I ${top_srcdir}/common
-+JK_INCL=-DUSE_APACHE_MD5 -I ${top_srcdir}/common -I ${top_builddir}/common
- JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
- JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
- APACHE_CFLAGS=@apache_include@ @APXSCFLAGS@ @APXSCPPFLAGS@ -I${top_srcdir}/common
diff --git a/www/mod_jk/patches/patch-jk_native_apache-1_3_mod_jk_c b/www/mod_jk/patches/patch-jk_native_apache-1_3_mod_jk_c
deleted file mode 100644
index 28fd82e162c..00000000000
--- a/www/mod_jk/patches/patch-jk_native_apache-1_3_mod_jk_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-jk_native_apache-1_3_mod_jk_c,v 1.1.1.1 2004/01/02 08:19:54 sturm Exp $
---- jk/native/apache-1.3/mod_jk.c.orig	2003-09-06 17:37:20.000000000 +0200
-+++ jk/native/apache-1.3/mod_jk.c	2004-01-02 08:56:52.000000000 +0100
-@@ -1598,7 +1598,7 @@ static int jk_handler(request_rec *r)
-                     }
-                     micro = tv_end.tv_usec - tv_begin.tv_usec;
-                     seconds = tv_end.tv_sec - tv_begin.tv_sec;
--                    duration = ap_psprintf(r->pool,"%.1d.%.6d",seconds,micro);
-+                    duration = ap_psprintf(r->pool,"%.1ld.%.6ld",seconds,micro);
-                     ap_table_setn(r->notes, JK_DURATION, duration);
-                     request_log_transaction(r,conf);
-                 }
diff --git a/www/mod_jk/patches/patch-jk_native_common_Makefile_in b/www/mod_jk/patches/patch-jk_native_common_Makefile_in
deleted file mode 100644
index f33fa03fe66..00000000000
--- a/www/mod_jk/patches/patch-jk_native_common_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-jk_native_common_Makefile_in,v 1.1 2004/10/12 20:53:06 naddy Exp $
---- jk/native/common/Makefile.in.orig	Thu Aug 12 00:12:27 2004
-+++ jk/native/common/Makefile.in	Thu Aug 12 00:12:40 2004
-@@ -17,7 +17,7 @@ OEXT=.lo
- include list.mk
- 
- JAVA_INCL=-I @JAVA_HOME@/include -I @JAVA_HOME@/include/@OS@
--CFLAGS=@apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS} ${JAVA_INCL}
-+CFLAGS=-I. @apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS} ${JAVA_INCL}
- 
- include @top_srcdir@/scripts/build/rules.mk
- 
diff --git a/www/mod_jk/patches/patch-jk_native_common_jk_pool_c b/www/mod_jk/patches/patch-jk_native_common_jk_pool_c
deleted file mode 100644
index 5771c098566..00000000000
--- a/www/mod_jk/patches/patch-jk_native_common_jk_pool_c
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD: patch-jk_native_common_jk_pool_c,v 1.1.1.1 2004/01/02 08:19:54 sturm Exp $
---- jk/native/common/jk_pool.c.orig	2002-09-25 00:35:05.000000000 +0200
-+++ jk/native/common/jk_pool.c	2004-01-02 08:56:52.000000000 +0100
-@@ -177,13 +177,13 @@ void *jk_pool_strdup(jk_pool_t *p, 
- void jk_dump_pool(jk_pool_t *p, 
-                   FILE *f)
- {
--    fprintf(f, "Dumping for pool [%x]\n", p);
-+    fprintf(f, "Dumping for pool [%p]\n", p);
-     fprintf(f, "size             [%d]\n", p->size);
-     fprintf(f, "pos              [%d]\n", p->pos);
--    fprintf(f, "buf              [%x]\n", p->buf);  
-+    fprintf(f, "buf              [%p]\n", p->buf);  
-     fprintf(f, "dyn_size         [%d]\n", p->dyn_size);
-     fprintf(f, "dyn_pos          [%d]\n", p->dyn_pos);
--    fprintf(f, "dynamic          [%x]\n", p->dynamic);
-+    fprintf(f, "dynamic          [%p]\n", p->dynamic);
- 
-     fflush(f);
- }
diff --git a/www/mod_jk/pkg/PLIST b/www/mod_jk/pkg/PLIST
index c335cb6db5e..887686592ee 100644
--- a/www/mod_jk/pkg/PLIST
+++ b/www/mod_jk/pkg/PLIST
@@ -1,60 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.4 2005/01/26 02:31:15 alek Exp $
+@comment $OpenBSD: PLIST,v 1.5 2005/03/05 01:04:11 kurt Exp $
 lib/mod_jk.so
 sbin/mod_jk-enable
 share/doc/mod_jk/
 share/doc/mod_jk/LICENSE
+share/doc/mod_jk/NOTICE
 share/doc/mod_jk/README.OpenBSD
-share/doc/mod_jk/common/
-share/doc/mod_jk/common/AJPv13-extensions-proposal.html
-share/doc/mod_jk/common/AJPv13.html
-share/doc/mod_jk/common/doccontrib.html
-share/doc/mod_jk/common/printer/
-share/doc/mod_jk/common/printer/AJPv13-extensions-proposal.html
-share/doc/mod_jk/common/printer/AJPv13.html
-share/doc/mod_jk/common/printer/doccontrib.html
-share/doc/mod_jk/common/printer/tools.html
-share/doc/mod_jk/common/tools.html
-share/doc/mod_jk/faq.html
-share/doc/mod_jk/images/
-share/doc/mod_jk/images/corner.gif
-share/doc/mod_jk/images/jakarta.gif
-share/doc/mod_jk/images/jk2.gif
-share/doc/mod_jk/images/jk2.png
-share/doc/mod_jk/images/mod_jk.jpg
-share/doc/mod_jk/images/pixel.gif
-share/doc/mod_jk/images/tomcat.ico
-share/doc/mod_jk/index.html
-share/doc/mod_jk/jk/
-share/doc/mod_jk/jk/aphowto.html
-share/doc/mod_jk/jk/domhowto.html
-share/doc/mod_jk/jk/iishowto.html
-share/doc/mod_jk/jk/neshowto.html
-share/doc/mod_jk/jk/printer/
-share/doc/mod_jk/jk/printer/aphowto.html
-share/doc/mod_jk/jk/printer/domhowto.html
-share/doc/mod_jk/jk/printer/iishowto.html
-share/doc/mod_jk/jk/printer/neshowto.html
-share/doc/mod_jk/jk/printer/quickhowto.html
-share/doc/mod_jk/jk/printer/workershowto.html
-share/doc/mod_jk/jk/quickhowto.html
-share/doc/mod_jk/jk/workershowto.html
-share/doc/mod_jk/jk2/
-share/doc/mod_jk/jk2/printer/
-share/doc/mod_jk/jk2/printer/confighowto.html
-share/doc/mod_jk/jk2/printer/configtc.html
-share/doc/mod_jk/jk2/printer/configtccom.html
-share/doc/mod_jk/jk2/printer/configtcex.html
-share/doc/mod_jk/jk2/printer/configweb.html
-share/doc/mod_jk/jk2/printer/configwebcom.html
-share/doc/mod_jk/jk2/printer/configwebex.html
-share/doc/mod_jk/jk2/printer/davhowto.html
-share/doc/mod_jk/jk2/printer/installhowto.html
-share/doc/mod_jk/jk2/printer/vhosthowto.html
-share/doc/mod_jk/printer/
-share/doc/mod_jk/printer/faq.html
-share/doc/mod_jk/printer/index.html
-share/doc/mod_jk/style.css
 share/examples/mod_jk/
 share/examples/mod_jk/mod_jk.conf
+@mode 444
+@sample /var/www/conf/mod_jk.conf
+@mode
 share/examples/mod_jk/workers.properties
+share/examples/mod_jk/workers.properties.minimal
+@mode 444
+@sample /var/www/conf/workers.properties
 @unexec rm -f /usr/lib/apache/modules/mod_jk.so