diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index cc61ee8760d..ce34de998a3 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2005/03/13 13:37:56 kurt Exp $
+# $OpenBSD: Makefile,v 1.8 2006/01/02 18:24:57 kurt Exp $
 
 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
@@ -6,12 +6,12 @@ SHARED_ONLY=		Yes
 
 COMMENT=		"Apache-Tomcat AJP Connector"
 
-V=			1.2.8
+V=			1.2.15
 DISTNAME=		jakarta-tomcat-connectors-${V}-src
-PKGNAME=		mod_jk-${V}p0
+PKGNAME=		mod_jk-${V}
 CATEGORIES=		www
 
-HOMEPAGE=		http://jakarta.apache.org/tomcat/connectors-doc/index.html
+HOMEPAGE=		http://tomcat.apache.org/connectors-doc/index.html
 
 MAINTAINER=		Kurt Miller <kurt@openbsd.org>
 
@@ -21,11 +21,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		${MASTER_SITE_APACHE:=jakarta/tomcat-connectors/jk/source/jk-$V/}
+MASTER_SITES=		${MASTER_SITE_APACHE:=tomcat/tomcat-connectors/jk/source/jk-$V/}
 
 SEPARATE_BUILD=		concurrent
 NO_REGRESS=		Yes
 USE_GMAKE=		Yes
+USE_LIBTOOL=		Yes
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--with-apxs=/usr/sbin/apxs
diff --git a/www/mod_jk/distinfo b/www/mod_jk/distinfo
index 3d4223ed04e..ba637fc46c2 100644
--- a/www/mod_jk/distinfo
+++ b/www/mod_jk/distinfo
@@ -1,4 +1,4 @@
-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
+MD5 (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = b815a666329f7de097775113547539e0
+RMD160 (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = e5bce1ad604e9461ca4684a2c7ffffe1f2a7b667
+SHA1 (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = c9a67de4e03d6d7780cf0b14284f62d30bb78156
+SIZE (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = 722463
diff --git a/www/mod_jk/files/README.OpenBSD b/www/mod_jk/files/README.OpenBSD
index 48ea0b100e0..aab468a5b9a 100644
--- a/www/mod_jk/files/README.OpenBSD
+++ b/www/mod_jk/files/README.OpenBSD
@@ -1,4 +1,4 @@
-$OpenBSD: README.OpenBSD,v 1.3 2005/03/05 01:04:11 kurt Exp $
+$OpenBSD: README.OpenBSD,v 1.4 2006/01/02 18:24:57 kurt Exp $
 
                           OpenBSD mod_jk Package
                        Apache-Tomcat AJP Connector
@@ -51,4 +51,4 @@ Configuration questions can be asked (after checking archives of course)
 by subscribing to the tomcat-user mailing list. Instructions for subscribing
 can be found here:
 
-http://jakarta.apache.org/site/mail2.html#Tomcat
+http://tomcat.apache.org/lists.html#tomcat-users
diff --git a/www/mod_jk/files/mod_jk.conf b/www/mod_jk/files/mod_jk.conf
index ee6e57bdc91..5998f369441 100644
--- a/www/mod_jk/files/mod_jk.conf
+++ b/www/mod_jk/files/mod_jk.conf
@@ -20,3 +20,11 @@ JkMount /webdav/* ajp13w
 
 JkMount /tomcat-docs ajp13w
 JkMount /tomcat-docs/* ajp13w
+
+# Enable the JK manager access from localhost only
+<Location /jkmanager/>
+   JkMount jkstatus
+   Order deny,allow
+   Deny from all
+   Allow from 127.0.0.1
+</Location>
diff --git a/www/mod_jk/patches/patch-jk_conf_workers_properties_minimal b/www/mod_jk/patches/patch-jk_conf_workers_properties_minimal
index 9c16406db61..24c6c6bde96 100644
--- a/www/mod_jk/patches/patch-jk_conf_workers_properties_minimal
+++ b/www/mod_jk/patches/patch-jk_conf_workers_properties_minimal
@@ -1,10 +1,28 @@
-$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
+$OpenBSD: patch-jk_conf_workers_properties_minimal,v 1.2 2006/01/02 18:24:57 kurt Exp $
+--- jk/conf/workers.properties.minimal.orig	Thu Apr 28 06:59:49 2005
++++ jk/conf/workers.properties.minimal	Tue Dec 13 13:43:24 2005
+@@ -6,22 +6,15 @@
+ # The workers that jk should create and work with
+ #
+ 
+-worker.list=wlb,jkstatus
++worker.list=ajp13w,jkstatus
+ 
+ #
+ # Defining a worker named ajp13w and of type ajp13
  # 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
+-
+-#
+-# Defining a load balancer
+-# 
+-
+-worker.wlb.type=lb
+-worker.wlb.balance_workers=ajp13w
+ 
+ #
+ # Define status worker